LUDOC-273 tune: update tunefs.lustre

Consistent mountfsoptions line. mballoc,extents are redundant
options since Lustre version ~2.5.

Change-Id: Ib328f11f4ce3978a0a7e6325facebf9f8e201dc9
Signed-off-by: Richard Henwood <richard.henwood@intel.com>
Reviewed-on: http://review.whamcloud.com/14481
Tested-by: Jenkins
Reviewed-by: Chris Hunter <chris.hunter@yale.edu>
Reviewed-by: Alex Zhuravlev <alexey.zhuravlev@intel.com>

diff --git a/SystemConfigurationUtilities.xml b/SystemConfigurationUtilities.xml
index f6f44a5..094854b 100644 (file)
--- a/SystemConfigurationUtilities.xml
+++ b/SystemConfigurationUtilities.xml
@@ -1655,8 +1655,9 @@ mkfs.lustre</title>
                     the default mount options with those specified on the command line, and issues a
                     warning on stderr if any default mount options are omitted.</para></warning>
                 <para>The defaults for ldiskfs are:</para>
-                <para>OST: <literal>errors=remount-ro</literal>;</para>
                 <para>MGS/MDT: <literal>errors=remount-ro,iopen_nopriv,user_xattr</literal></para>
+                <para>OST: <literal>errors=remount-ro,extents,mballoc</literal></para>
+                <para condition='l25'>OST: <literal>errors=remount-ro</literal></para>
                 <para>Use care when altering the default mount options.</para>
               </entry>
             </row>
@@ -2444,8 +2445,9 @@ tunefs.lustre</title>
                 <para> Sets the mount options used when the backing file system is mounted.</para>
                 <warning><para> Unlike earlier versions of tunefs.lustre, this version completely replaces the existing mount options with those specified on the command line, and issues a warning on stderr if any default mount options are omitted.</para></warning>
                 <para>The defaults for ldiskfs are:</para>
-                <para>OST: <literal>errors=remount-ro,mballoc,extents</literal>;</para>
                 <para>MGS/MDT: <literal>errors=remount-ro,iopen_nopriv,user_xattr</literal></para>
+                <para>OST: <literal>errors=remount-ro,extents,mballoc</literal></para>
+                <para condition='l25'>OST: <literal>errors=remount-ro</literal></para>
                 <para>Do not alter the default mount options unless you know what you are doing.</para>
               </entry>
             </row>