From 59ea0bc323e725cf9e5051144d82665f27814ce6 Mon Sep 17 00:00:00 2001
From: Patrick Farrell <paf@cray.com>
Date: Wed, 16 May 2018 10:09:45 -0500
Subject: [PATCH] LUDOC-379: Ladvise Lockahead

Correct errors in lockahead documentation.

Change-Id: I833b782c437d5429bca365207d05df21d625eb26
Signed-off-by: Patrick Farrell <paf@cray.com>
Reviewed-on: https://review.whamcloud.com/32436
Tested-by: Jenkins
Reviewed-by: Joseph Gmitter <joseph.gmitter@intel.com>
---
 LustreTuning.xml            |  9 +++------
 SettingLustreProperties.xml | 15 +++++++++++----
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/LustreTuning.xml b/LustreTuning.xml
index 9864883..e4970f1 100644
--- a/LustreTuning.xml
+++ b/LustreTuning.xml
@@ -2186,8 +2186,6 @@ ldlm.namespaces.filter-<replaceable>fsname</replaceable>-*.
                 of the given mode on the given byte range </para>
                 <para><literal>noexpand</literal> Disable extent lock expansion
                 behavior for I/O to this file descriptor</para>
-                <para><literal>unset</literal> Unset/clear a previous advice
-                (Currently only supports LU_ADVISE_LOCKNOEXPAND)</para>
               </entry>
             </row>
             <row>
@@ -2267,10 +2265,9 @@ ldlm.namespaces.filter-<replaceable>fsname</replaceable>-*.
       from the normal LDLM locking behavior.
       </para>
       <para>
-      Note that the <literal>noexpand</literal> and <literal>unset</literal>
-      advices work on a specific file descriptor, so using them via lfs has no
-      effect.  They must be used on a particular file descriptor which is used
-      for i/o to have any effect.
+      Note that the <literal>noexpand</literal> advice works on a specific
+      file descriptor, so using it via lfs has no effect.  It must be used
+      on a particular file descriptor which is used for i/o to have any effect.
       </para>
       <para>The main difference between the Linux <literal>fadvise()</literal>
       system call and <literal>lfs ladvise</literal> is that
diff --git a/SettingLustreProperties.xml b/SettingLustreProperties.xml
index 5aa4c8d..4c2628f 100644
--- a/SettingLustreProperties.xml
+++ b/SettingLustreProperties.xml
@@ -861,11 +861,17 @@ struct llapi_lu_ladvise {
           descriptor <emphasis>fd</emphasis> from an application to one or more
           Lustre servers.  Optionally, <emphasis>flags</emphasis> can modify how
           the advice will be processed via bitwise-or'd values:</para>
-          <itemizedlist><listitem>
-          <para><literal>LF_ASYNC</literal>:  Clients return to userspace
+          <itemizedlist>
+          <listitem>
+          <para><literal>LF_ASYNC</literal>: Clients return to userspace
           immediately after submitting ladvise RPCs, leaving server threads to
           handle the advices asynchronously.</para>
-          </listitem></itemizedlist>
+          </listitem>
+          <listitem>
+          <para><literal>LF_UNSET</literal>: Unset/clear a previous advice
+          (Currently only supports LU_ADVISE_LOCKNOEXPAND).</para>
+          </listitem>
+          </itemizedlist>
           <para>Each of the <emphasis>ladvise</emphasis> elements is an
           <emphasis>llapi_lu_ladvise</emphasis> structure, which contains the
           following fields:
@@ -945,7 +951,8 @@ struct llapi_lu_ladvise {
                 <entry>
                   <para>When using advices which support them, the 'lla_value2'
                   field is used to communicate per-advice flags and can be
-                  referred to as 'lla_peradvice_flags'.</para>
+                  referred to as 'lla_peradvice_flags'. Both LF_ASYNC and
+                  LF_UNSET are supported as peradvice flags.</para>
                 </entry>
               </row>
               <row>
-- 
1.8.3.1