Branch b1_4

Add documentation for the supplementary group upcall in lmc docs.
Fix minor inconsistency between lmc and lconf usage.
b=9259

diff --git a/lustre/doc/lmc.1 b/lustre/doc/lmc.1
index 1f05f0b..0377c33 100644 (file)
--- a/lustre/doc/lmc.1
+++ b/lustre/doc/lmc.1
@@ -51,6 +51,9 @@ Specify the location of the Portals upcall scripts used by the client for recove
 --upcall <path> 
 Specify the location of both (Lustre and Portals) upcall scripts used by the client for recovery.
 .TP
+--group_upcall <path> 
+Specify the location of the group upcall scripts used by the MDS for determiningsupplementary group membership.
+.TP
 --ptldebug <debug_level>
 Set the portals debug level.
 .TP

diff --git a/lustre/doc/lmc.lyx b/lustre/doc/lmc.lyx
index 837c61f..aa44852 100644 (file)
--- a/lustre/doc/lmc.lyx
+++ b/lustre/doc/lmc.lyx
@@ -170,6 +170,11 @@ The arguments required are:
  scripts used by the client for recovery
 \layout Description
 
+--group_upcall\SpecialChar ~
+<path> Specify the location of the group upcall scripts used by the MDS
+ for determiningsupplementary group membership
+\layout Description
+
 --ptldebug\SpecialChar ~
 <debug_level> Set the portals debug level.
 \layout Description

diff --git a/lustre/utils/lconf b/lustre/utils/lconf
index 0411946..66628bf 100755 (executable)
--- a/lustre/utils/lconf
+++ b/lustre/utils/lconf
@@ -871,7 +871,7 @@ def mkfs(dev, devsize, fstype, jsize, isize, mkfsoptions, isblock=1):
         # devsize is in 1k, and fs block count is in 4k
         block_cnt = devsize/4
 
-    if fstype in ('ext3', 'extN', 'ldiskfs'):
+    if fstype in ('ext3', 'ldiskfs'):
         # ext3 journal size is in megabytes
         if jsize == 0:
             if devsize == 0:
@@ -944,7 +944,7 @@ def mkfs(dev, devsize, fstype, jsize, isize, mkfsoptions, isblock=1):
     if ret:
         panic("Unable to build fs:", dev, string.join(out))
     # enable hash tree indexing on fsswe
-    if fstype in ('ext3', 'extN', 'ldiskfs'):
+    if fstype in ('ext3', 'ldiskfs'):
         htree = 'tune2fs -O dir_index'
         (ret, out) = run (htree, dev)
         if ret:

diff --git a/lustre/utils/lmc b/lustre/utils/lmc
index 78435c0..5b6ea40 100755 (executable)
--- a/lustre/utils/lmc
+++ b/lustre/utils/lmc
@@ -66,7 +66,7 @@ Object creation command summary:
   --timeout num
   --upcall path
   --lustre_upcall path
-  --groups_upcall path
+  --group_upcall path
   --portals_upcall path
   --ptldebug debug_level
   --subsystem subsystem_name
@@ -162,7 +162,7 @@ lmc_options = [
     ('timeout', "Set timeout to initiate recovery.", PARAM),
     ('upcall', "Set both lustre and portals upcall scripts.", PARAM),
     ('lustre_upcall', "Set location of lustre upcall script.", PARAM),
-    ('groups_upcall', "Set location of extended groups upcall script.", PARAM),
+    ('group_upcall', "Set location of extended groups upcall script.", PARAM),
     ('portals_upcall', "Set location of portals upcall script.", PARAM),
     ('ptldebug', "Set the portals debug level",  PARAM),
     ('subsystem', "Specify which Lustre subsystems have debug output recorded in the log",  PARAM),