Branch b1_4

Update usage and docs for lfs setstripe -d.

diff --git a/lustre/doc/lfs.1 b/lustre/doc/lfs.1
index 5e676f2..357aab1 100644 (file)
--- a/lustre/doc/lfs.1
+++ b/lustre/doc/lfs.1
@@ -7,9 +7,11 @@ lfs \- Lustre utility to create a file with specific striping pattern, find the
 .br
 .B lfs find [--obd <uuid>] [--quiet | --verbose] [--recursive] <dir|file>
 .br
-.B lfs getstripe <file-name> 
+.B lfs getstripe <filename> 
 .br
-.B lfs setstripe <filename> <stripe-size> <start-ost> <stripe-cnt>
+.B lfs setstripe <filename|dirname> <stripe-size> <start-ost> <stripe-cnt>
+.br
+.B lfs setstripe -d <dirname>
 .SH DESCRIPTION
 .B lfs
 can be used to create a new file with a specific striping pattern, determine the default striping pattern, gather the extended attributes (object numbers and 
@@ -35,19 +37,27 @@ Quit the interactive lfs session
 
 .SH EXAMPLES
 .TP
-.B $lfs setstripe /mnt/lustre/file1 131072 0 1
-This creats a file striped on one OST
+This creates a file striped on one OST
+.B $ lfs setstripe /mnt/lustre/file1 131072 0 1
+.TP
+This creates a default stripe pattern on an existing dir for all new files
+created therein.
+.B $ lfs setstripe /mnt/lustre/dir 131072 0 1
+.TP
+This deletes a default stripe pattern on dir.  New files will use the
+default striping pattern.
+.B $ lfs setstripe -d /mnt/lustre/dir
 .TP
-.B $lfs find /mnt/lustre/file1
 Lists the extended attributes of a given file
+.B $ lfs find /mnt/lustre/file1
 .TP
-.B $lfs find /mnt/lustre/
 Lists the extended attributes of all files in a given directory
+.B $ lfs find /mnt/lustre/
 .TP
-.B $lfs find -r /mnt/lustre/
 Recursively list the extended attributes of all files in a given directory tree
+.B $ lfs find -r /mnt/lustre/
 .TP
-.B $lfs find -r --obd OST2-UUID /mnt/lustre/
 List all the files that have objects on a specific OST
+.B $ lfs find -r --obd OST2-UUID /mnt/lustre/
 .SH BUGS
 None are known.

diff --git a/lustre/doc/lfs.lyx b/lustre/doc/lfs.lyx
index 28890e0..091c043 100644 (file)
--- a/lustre/doc/lfs.lyx
+++ b/lustre/doc/lfs.lyx
@@ -52,13 +52,18 @@ find [--obd <uuid>] [--quiet | --verbose] [--recursive] <dir|file>
 
 \series bold 
 lfs\SpecialChar ~
-getstripe <file_name> 
+getstripe <filename> 
 \layout Standard
 
 
 \series bold 
 lfs\SpecialChar ~
-setstripe <filename> <stripe_size> <start_ost> <stripe_cnt>
+setstripe <filename|dirname> <stripe_size> <start_ost> <stripe_cnt>
+\layout Standard
+
+\series bold 
+lfs\SpecialChar ~
+setstripe -d <dirname>
 \layout Standard
 
 
@@ -140,57 +145,31 @@ exit/quit
 EXAMPLES
 \layout Description
 
-Creating\SpecialChar ~
-a\SpecialChar ~
-file\SpecialChar ~
-striped\SpecialChar ~
-on\SpecialChar ~
-one\SpecialChar ~
-OST
+This creates a file striped on one OST
 \layout LyX-Code
 
-   $lfs setstripe /mnt/lustre/file1 131072 0 1
+   $ lfs setstripe /mnt/lustre/file1 131072 0 1
 \layout Description
 
-Listing
-\series bold 
-\SpecialChar ~
-
-\series default 
-the
-\series bold 
-\SpecialChar ~
-
-\series default 
-extended
-\series bold 
-\SpecialChar ~
-
-\series default 
-attributes
-\series bold 
-\SpecialChar ~
+This creates a default stripe pattern on and existing dir for all new files
+ created therein.
+\layout LyX-Code
 
-\series default 
-of
-\series bold 
-\SpecialChar ~
+   $ lfs setstripe /mnt/lustre/dir 131072 0 1
+\layout Description
 
-\series default 
-a
-\series bold 
-\SpecialChar ~
+This deletes a default stripe pattern on dir.  New files will use the
+ default striping pattern.
+ created therein.
+\layout LyX-Code
 
-\series default 
-given
-\series bold 
-\SpecialChar ~
+   $ lfs setstripe -d /mnt/lustre/dir
+\layout Description
 
-\series default 
-file
+Listing the extended attributes of a given file
 \layout LyX-Code
 
-   $lfs find /mnt/lustre/foo1
+   $ lfs find /mnt/lustre/foo1
 \layout LyX-Code
 
    OBDS:    
@@ -208,66 +187,29 @@ file
    0                 1            0x1                0 
 \layout Description
 
-Listing\SpecialChar ~
-the\SpecialChar ~
-extended\SpecialChar ~
-attributes\SpecialChar ~
-of\SpecialChar ~
-all\SpecialChar ~
-files\SpecialChar ~
-in\SpecialChar ~
-a\SpecialChar ~
-given\SpecialChar ~
-directory
+Listing the extended attributes of all files in a given directory
 \layout LyX-Code
 
-   $lfs find /mnt/lustre/
+   $ lfs find /mnt/lustre/
 \layout Description
 
-Recursively\SpecialChar ~
-list\SpecialChar ~
-the\SpecialChar ~
-extended\SpecialChar ~
-attributes\SpecialChar ~
-of\SpecialChar ~
-all\SpecialChar ~
-files\SpecialChar ~
-in\SpecialChar ~
-a\SpecialChar ~
-given\SpecialChar ~
-directory\SpecialChar ~
-tree
+Recursively list the extended attributes of all files in a given directory
+ tree
 \layout LyX-Code
 
-   $lfs find -r /mnt/lustre/
+   $ lfs find -r /mnt/lustre/
 \layout Description
 
-List\SpecialChar ~
-all\SpecialChar ~
-the\SpecialChar ~
-files\SpecialChar ~
-that\SpecialChar ~
-have\SpecialChar ~
-objects\SpecialChar ~
-on\SpecialChar ~
-a\SpecialChar ~
-specific\SpecialChar ~
-OST
+List all the files that have objects on a specific OST
 \layout LyX-Code
 
-   $lfs find -r --obd OST2_UUID /mnt/lustre/
+   $ lfs find -r --obd OST2_UUID /mnt/lustre/
 \layout Description
 
-Check\SpecialChar ~
-the\SpecialChar ~
-status\SpecialChar ~
-of\SpecialChar ~
-all\SpecialChar ~
-servers(mds,\SpecialChar ~
-osts)
+Check the status of all servers(mds, osts)
 \layout LyX-Code
 
-   $lfs check servers 
+   $ lfs check servers 
 \layout LyX-Code
 
    OSC_localhost.localdomain_OST_localhost_mds1 active.
@@ -284,13 +226,10 @@ osts)
    $
 \layout Description
 
-List\SpecialChar ~
-all\SpecialChar ~
-the\SpecialChar ~
-OSTs
+List all the OSTs
 \layout LyX-Code
 
-   $lfs osts 
+   $ lfs osts 
 \layout LyX-Code
 
    OBDS:    

diff --git a/lustre/utils/lfs.c b/lustre/utils/lfs.c
index 6efcaf8..7260275 100644 (file)
--- a/lustre/utils/lfs.c
+++ b/lustre/utils/lfs.c
@@ -77,7 +77,7 @@ command_t cmdlist[] = {
          "delete the default striping pattern from an existing directory\n"
          "usage: setstripe <filename|dirname> <stripe size> <stripe start> <stripe count>\n"
          "       or \n"
-         "       setstripe -d <dirname>\n"
+         "       setstripe -d <dirname>   (to delete default striping)\n"
          "\tstripe size:  Number of bytes in each stripe (0 default)\n"
          "\tstripe start: OST index of first stripe (-1 default)\n"
          "\tstripe count: Number of OSTs to stripe over (0 default, -1 all)"},