Branch b1_5

b=8007
remove some non-applicable options from tunefs

diff --git a/lustre/utils/mkfs_lustre.c b/lustre/utils/mkfs_lustre.c
index b08ee53..d2ad752 100644 (file)
--- a/lustre/utils/mkfs_lustre.c
+++ b/lustre/utils/mkfs_lustre.c
@@ -92,9 +92,9 @@ void usage(FILE *out)
                 "\t\t\tfor this device on an alternate device\n"
                 */
                 "\t\t--mountfsoptions=<opts> : permanent mount options\n"
+#ifndef TUNEFS
                 "\t\t--backfstype=<fstype> : backing fs type (ext3, ldiskfs)\n"
                 "\t\t--device-size=#N(KB) : device size for loop devices\n"
-#ifndef TUNEFS
                 "\t\t--mkfsoptions=<opts> : format options\n"
                 "\t\t--reformat: overwrite an existing disk\n"
                 "\t\t--stripe-count-hint=#N : used for optimizing MDT inode size\n"

diff --git a/lustre/utils/mount_lustre.c b/lustre/utils/mount_lustre.c
index 67aa784..8429995 100644 (file)
--- a/lustre/utils/mount_lustre.c
+++ b/lustre/utils/mount_lustre.c
@@ -187,7 +187,7 @@ static const struct opt_map opt_map[] = {
   { "nouser",   1, 1, 0         },      /* Forbid ordinary user to mount */
   { "noowner",  1, 1, 0         },      /* Device owner has no special privs */
   { "_netdev",  1, 0, 0         },      /* Device accessible only via network */
-  /* These flags are passed through and parsed in lustre ll_options */
+  /* These flags are passed through and parsed in lmd_parse & ll_options */
   { "flock",    0, 0, 0         },      /* Enable flock support */
   { "noflock",  0, 1, 0         },      /* Disable flock support */
   { "user_xattr",   0, 0, 0     },      /* Enable get/set user xattr */