* [PATCH 0/3] xfsprogs: manpage & usage string fixups
@ 2013-04-22 22:37 Eric Sandeen
2013-04-22 22:39 ` [PATCH 1/3] xfsprogs: manpage spelling fixes Eric Sandeen
` (2 more replies)
0 siblings, 3 replies; 22+ messages in thread
From: Eric Sandeen @ 2013-04-22 22:37 UTC (permalink / raw)
To: xfs-oss
The helpful QE elves at Red Hat wrote scripts to check
manpages, usage strings, and actual accepted arguments,
and found lots of inconsistencies in xfsprogs, as well
as spelling errors. Fixups follow.
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
^ permalink raw reply [flat|nested] 22+ messages in thread* [PATCH 1/3] xfsprogs: manpage spelling fixes 2013-04-22 22:37 [PATCH 0/3] xfsprogs: manpage & usage string fixups Eric Sandeen @ 2013-04-22 22:39 ` Eric Sandeen 2013-04-23 15:18 ` Rich Johnston 2013-04-25 14:12 ` [PATCH 1/3 V2] " Eric Sandeen 2013-04-22 22:40 ` [PATCH 2/3] xfsprogs: Fix manpages for missing or incorrect options Eric Sandeen 2013-04-22 22:42 ` [PATCH 3/3] xfsprogs: Fix up usage() errors and omissions Eric Sandeen 2 siblings, 2 replies; 22+ messages in thread From: Eric Sandeen @ 2013-04-22 22:39 UTC (permalink / raw) To: xfs-oss Fix several spelling errors in xfsprogs manpages. Signed-off-by: Eric Sandeen <sandeen@redhat.com> --- diff --git a/man/man5/projects.5 b/man/man5/projects.5 index d8fb56d..6845540 100644 --- a/man/man5/projects.5 +++ b/man/man5/projects.5 @@ -1,6 +1,6 @@ .TH projects 5 .SH NAME -projects \- persistent project root defintion +projects \- persistent project root definition .SH DESCRIPTION The .I /etc/projects diff --git a/man/man8/mkfs.xfs.8 b/man/man8/mkfs.xfs.8 index fa52152..7f3a4b4 100644 --- a/man/man8/mkfs.xfs.8 +++ b/man/man8/mkfs.xfs.8 @@ -279,7 +279,7 @@ with .BR log= , or as the number fitting in a filesystem block with .BR perblock= . -The mininum (and default) +The minimum (and default) .I value is 256 bytes. The maximum @@ -297,7 +297,7 @@ so if no inode size is given on the command line, .B mkfs.xfs will attempt to choose a size such that inode numbers will be < 32 bits. If an inode size -is specified, or if a filesystem is sufficently large, +is specified, or if a filesystem is sufficiently large, .B mkfs.xfs will warn if this will create inode numbers > 32 significant bits. diff --git a/man/man8/xfs_db.8 b/man/man8/xfs_db.8 index 17ac601..646380c 100644 --- a/man/man8/xfs_db.8 +++ b/man/man8/xfs_db.8 @@ -960,12 +960,12 @@ and (1 if the extent is unwritten). .TP .B keys -[nonleaf blocks only] array of key records. These are the first key +[non-leaf blocks only] array of key records. These are the first key value of each block in the level below this one. Each record contains .BR startoff . .TP .B ptrs -[nonleaf blocks only] array of child block pointers. +[non-leaf blocks only] array of child block pointers. Each pointer is a filesystem block number to the next level in the Btree. .PD .RE @@ -975,7 +975,7 @@ There is one set of filesystem blocks forming the by-block-number allocation Btree for each allocation group. The root block of this Btree is designated by the .B bnoroot -field in the coresponding AGF block. +field in the corresponding AGF block. The blocks are linked to sibling left and right blocks at each level, as well as by pointers from parent to child blocks. Each block has the following fields: @@ -1004,14 +1004,14 @@ and .BR blockcount . .TP .B keys -[nonleaf blocks only] array of key records. These are the first value +[non-leaf blocks only] array of key records. These are the first value of each block in the level below this one. Each record contains .B startblock and .BR blockcount . .TP .B ptrs -[nonleaf blocks only] array of child block pointers. Each pointer is a +[non-leaf blocks only] array of child block pointers. Each pointer is a block number within the allocation group to the next level in the Btree. .PD .RE @@ -1021,7 +1021,7 @@ There is one set of filesystem blocks forming the by-block-count allocation Btree for each allocation group. The root block of this Btree is designated by the .B cntroot -field in the coresponding AGF block. The blocks are linked to sibling +field in the corresponding AGF block. The blocks are linked to sibling left and right blocks at each level, as well as by pointers from parent to child blocks. Each block has the following fields: .RS 1.4i @@ -1049,14 +1049,14 @@ and .BR blockcount . .TP .B keys -[nonleaf blocks only] array of key records. These are the first value +[non-leaf blocks only] array of key records. These are the first value of each block in the level below this one. Each record contains .B blockcount and .BR startblock . .TP .B ptrs -[nonleaf blocks only] array of child block pointers. Each pointer is a +[non-leaf blocks only] array of child block pointers. Each pointer is a block number within the allocation group to the next level in the Btree. .PD .RE @@ -1368,7 +1368,7 @@ number of warnings issued about realtime block limit violations. There is one set of filesystem blocks forming the inode allocation Btree for each allocation group. The root block of this Btree is designated by the .B root -field in the coresponding AGI block. +field in the corresponding AGI block. The blocks are linked to sibling left and right blocks at each level, as well as by pointers from parent to child blocks. Each block has the following fields: @@ -1400,12 +1400,12 @@ count of free inodes in this chunk, and bitmap, LSB corresponds to inode 0. .TP .B keys -[nonleaf blocks only] array of key records. These are the first value of each +[non-leaf blocks only] array of key records. These are the first value of each block in the level below this one. Each record contains .BR startino . .TP .B ptrs -[nonleaf blocks only] array of child block pointers. Each pointer is a +[non-leaf blocks only] array of child block pointers. Each pointer is a block number within the allocation group to the next level in the Btree. .PD .RE diff --git a/man/man8/xfs_mdrestore.8 b/man/man8/xfs_mdrestore.8 index a7d2b68..7b9ba89 100644 --- a/man/man8/xfs_mdrestore.8 +++ b/man/man8/xfs_mdrestore.8 @@ -16,7 +16,7 @@ to a filesystem. The .I source argument specifies the location of the metadump image and the .I target -argument specifies the destination for the filsystem image. +argument specifies the destination for the filesystem image. If the .I source is \-, then the metadata image is read from stdin. This allows the output of diff --git a/man/man8/xfs_quota.8 b/man/man8/xfs_quota.8 index f3b54cc..9327feb 100644 --- a/man/man8/xfs_quota.8 +++ b/man/man8/xfs_quota.8 @@ -623,7 +623,7 @@ can be used to limit recursion level (\-1 is infinite, 0 is top level only, 1 is first level ... ). Option .B \-p -adds posibility to specify project paths in command line without a need +adds possibility to specify project paths in command line without a need for .I /etc/projects to exist. Note that if projects file exists then it is also used. diff --git a/man/man8/xfs_repair.8 b/man/man8/xfs_repair.8 index 57c97da..7b296ba 100644 --- a/man/man8/xfs_repair.8 +++ b/man/man8/xfs_repair.8 @@ -170,7 +170,7 @@ Verbose output. Repair dangerously. Allow .B xfs_repair to repair an XFS filesystem mounted read only. This is typically done -on a root fileystem from single user mode, immediately followed by a reboot. +on a root filesystem from single user mode, immediately followed by a reboot. .TP .B \-V Prints out the current version number and exits. @@ -239,7 +239,7 @@ The name assigned is the inode number. aborts on most disk I/O errors. Therefore, if you are trying to repair a filesystem that was damaged due to a disk drive failure, steps should be taken to ensure that all blocks in the filesystem are -readable and writeable before attempting to use +readable and writable before attempting to use .B xfs_repair to repair the filesystem. A possible method is using .BR dd (8) _______________________________________________ xfs mailing list xfs@oss.sgi.com http://oss.sgi.com/mailman/listinfo/xfs ^ permalink raw reply related [flat|nested] 22+ messages in thread
* Re: [PATCH 1/3] xfsprogs: manpage spelling fixes 2013-04-22 22:39 ` [PATCH 1/3] xfsprogs: manpage spelling fixes Eric Sandeen @ 2013-04-23 15:18 ` Rich Johnston 2013-04-23 15:43 ` Dave Howorth 2013-04-23 19:36 ` Eric Sandeen 2013-04-25 14:12 ` [PATCH 1/3 V2] " Eric Sandeen 1 sibling, 2 replies; 22+ messages in thread From: Rich Johnston @ 2013-04-23 15:18 UTC (permalink / raw) To: Eric Sandeen; +Cc: xfs-oss On 04/22/2013 05:39 PM, Eric Sandeen wrote: > Fix several spelling errors in xfsprogs manpages. > > Signed-off-by: Eric Sandeen <sandeen@redhat.com> > --- > > diff --git a/man/man5/projects.5 b/man/man5/projects.5 #rcj OK > diff --git a/man/man8/mkfs.xfs.8 b/man/man8/mkfs.xfs.8 #rcj serialisation is misspelled, should be serialization. > diff --git a/man/man8/xfs_db.8 b/man/man8/xfs_db.8 #rcj guarenteed should be guaranteed #rcj Nonleaf to Non-leaf ???? not sure about that one :) > diff --git a/man/man8/xfs_mdrestore.8 b/man/man8/xfs_mdrestore.8 #rcj OK > diff --git a/man/man8/xfs_quota.8 b/man/man8/xfs_quota.8 #rcj OK > diff --git a/man/man8/xfs_repair.8 b/man/man8/xfs_repair.8 #rcj OK _______________________________________________ xfs mailing list xfs@oss.sgi.com http://oss.sgi.com/mailman/listinfo/xfs ^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PATCH 1/3] xfsprogs: manpage spelling fixes 2013-04-23 15:18 ` Rich Johnston @ 2013-04-23 15:43 ` Dave Howorth 2013-04-23 15:59 ` Rich Johnston 2013-04-23 19:36 ` Eric Sandeen 1 sibling, 1 reply; 22+ messages in thread From: Dave Howorth @ 2013-04-23 15:43 UTC (permalink / raw) To: xfs Rich Johnston wrote: >> diff --git a/man/man8/mkfs.xfs.8 b/man/man8/mkfs.xfs.8 > #rcj serialisation is misspelled, should be serialization. That depends on where you live, of course. It is derived from a Latin root, I think, so should have an 's'. At least, where I live. Do manpages have a policy as regards spelling? _______________________________________________ xfs mailing list xfs@oss.sgi.com http://oss.sgi.com/mailman/listinfo/xfs ^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PATCH 1/3] xfsprogs: manpage spelling fixes 2013-04-23 15:43 ` Dave Howorth @ 2013-04-23 15:59 ` Rich Johnston 2013-04-23 16:20 ` Stefan Ring 0 siblings, 1 reply; 22+ messages in thread From: Rich Johnston @ 2013-04-23 15:59 UTC (permalink / raw) To: Dave Howorth; +Cc: xfs On 04/23/2013 10:43 AM, Dave Howorth wrote: > Rich Johnston wrote: >>> diff --git a/man/man8/mkfs.xfs.8 b/man/man8/mkfs.xfs.8 >> #rcj serialisation is misspelled, should be serialization. > > That depends on where you live, of course. It is derived from a Latin > root, I think, so should have an 's'. At least, where I live. Good point Dave, I did not think to look that one up online, my bad for trusting my spell checker and my locale. ;) Was unaware that that one is spelled two ways (darn British have to spell it differently, or is it those darn colonists don't know how to spell i.e. color colour) > > Do manpages have a policy as regards spelling? Not to my knowledge. _______________________________________________ xfs mailing list xfs@oss.sgi.com http://oss.sgi.com/mailman/listinfo/xfs ^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PATCH 1/3] xfsprogs: manpage spelling fixes 2013-04-23 15:59 ` Rich Johnston @ 2013-04-23 16:20 ` Stefan Ring 0 siblings, 0 replies; 22+ messages in thread From: Stefan Ring @ 2013-04-23 16:20 UTC (permalink / raw) To: Rich Johnston; +Cc: Dave Howorth, Linux fs XFS >> Do manpages have a policy as regards spelling? > > Not to my knowledge. But if the rest of the man page / package is en_US, as is likely the case, it would make sense to stick to this locale. _______________________________________________ xfs mailing list xfs@oss.sgi.com http://oss.sgi.com/mailman/listinfo/xfs ^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PATCH 1/3] xfsprogs: manpage spelling fixes 2013-04-23 15:18 ` Rich Johnston 2013-04-23 15:43 ` Dave Howorth @ 2013-04-23 19:36 ` Eric Sandeen 1 sibling, 0 replies; 22+ messages in thread From: Eric Sandeen @ 2013-04-23 19:36 UTC (permalink / raw) To: Rich Johnston; +Cc: xfs-oss On 4/23/13 10:18 AM, Rich Johnston wrote: > On 04/22/2013 05:39 PM, Eric Sandeen wrote: >> Fix several spelling errors in xfsprogs manpages. >> >> Signed-off-by: Eric Sandeen <sandeen@redhat.com> >> --- >> >> diff --git a/man/man5/projects.5 b/man/man5/projects.5 > #rcj OK > >> diff --git a/man/man8/mkfs.xfs.8 b/man/man8/mkfs.xfs.8 > #rcj serialisation is misspelled, should be serialization. > >> diff --git a/man/man8/xfs_db.8 b/man/man8/xfs_db.8 > #rcj guarenteed should be guaranteed whoops I missed that, didn't introduce it, did I? > #rcj Nonleaf to Non-leaf ???? not sure about that one :) $ aspell -a @(#) International Ispell Version 3.1.20 (but really Aspell 0.60.6) nonleaf & nonleaf 11 0: non leaf, non-leaf, ... *shrug* -Eric >> diff --git a/man/man8/xfs_mdrestore.8 b/man/man8/xfs_mdrestore.8 > #rcj OK > >> diff --git a/man/man8/xfs_quota.8 b/man/man8/xfs_quota.8 > #rcj OK > >> diff --git a/man/man8/xfs_repair.8 b/man/man8/xfs_repair.8 > #rcj OK > > _______________________________________________ > xfs mailing list > xfs@oss.sgi.com > http://oss.sgi.com/mailman/listinfo/xfs > _______________________________________________ xfs mailing list xfs@oss.sgi.com http://oss.sgi.com/mailman/listinfo/xfs ^ permalink raw reply [flat|nested] 22+ messages in thread
* [PATCH 1/3 V2] xfsprogs: manpage spelling fixes 2013-04-22 22:39 ` [PATCH 1/3] xfsprogs: manpage spelling fixes Eric Sandeen 2013-04-23 15:18 ` Rich Johnston @ 2013-04-25 14:12 ` Eric Sandeen 2013-04-25 14:59 ` Rich Johnston 2013-04-25 20:43 ` Rich Johnston 1 sibling, 2 replies; 22+ messages in thread From: Eric Sandeen @ 2013-04-25 14:12 UTC (permalink / raw) To: xfs-oss Fix several spelling errors in xfsprogs manpages. Signed-off-by: Eric Sandeen <sandeen@redhat.com> --- V2: fix serialization, guaranteed diff --git a/man/man5/projects.5 b/man/man5/projects.5 index d8fb56d..6845540 100644 --- a/man/man5/projects.5 +++ b/man/man5/projects.5 @@ -1,6 +1,6 @@ .TH projects 5 .SH NAME -projects \- persistent project root defintion +projects \- persistent project root definition .SH DESCRIPTION The .I /etc/projects diff --git a/man/man8/mkfs.xfs.8 b/man/man8/mkfs.xfs.8 index fa52152..f707881 100644 --- a/man/man8/mkfs.xfs.8 +++ b/man/man8/mkfs.xfs.8 @@ -279,7 +279,7 @@ with .BR log= , or as the number fitting in a filesystem block with .BR perblock= . -The mininum (and default) +The minimum (and default) .I value is 256 bytes. The maximum @@ -297,7 +297,7 @@ so if no inode size is given on the command line, .B mkfs.xfs will attempt to choose a size such that inode numbers will be < 32 bits. If an inode size -is specified, or if a filesystem is sufficently large, +is specified, or if a filesystem is sufficiently large, .B mkfs.xfs will warn if this will create inode numbers > 32 significant bits. @@ -450,7 +450,7 @@ suboption is specified. This changes the method of logging various persistent counters in the superblock. Under metadata intensive workloads, these counters are updated and logged frequently enough that the superblock -updates become a serialisation point in the filesystem. The +updates become a serialization point in the filesystem. The .I value can be either 0 or 1. .IP diff --git a/man/man8/xfs_db.8 b/man/man8/xfs_db.8 index 17ac601..0558671 100644 --- a/man/man8/xfs_db.8 +++ b/man/man8/xfs_db.8 @@ -64,7 +64,7 @@ and Allows execution on a mounted filesystem, provided it is mounted read-only. Useful for shell scripts such as .BR xfs_check (8), -which must only operate on filesystems in a guarenteed consistent state +which must only operate on filesystems in a guaranteed consistent state (either unmounted or mounted read-only). These semantics are slightly different to that of the .B -r @@ -960,12 +960,12 @@ and (1 if the extent is unwritten). .TP .B keys -[nonleaf blocks only] array of key records. These are the first key +[non-leaf blocks only] array of key records. These are the first key value of each block in the level below this one. Each record contains .BR startoff . .TP .B ptrs -[nonleaf blocks only] array of child block pointers. +[non-leaf blocks only] array of child block pointers. Each pointer is a filesystem block number to the next level in the Btree. .PD .RE @@ -975,7 +975,7 @@ There is one set of filesystem blocks forming the by-block-number allocation Btree for each allocation group. The root block of this Btree is designated by the .B bnoroot -field in the coresponding AGF block. +field in the corresponding AGF block. The blocks are linked to sibling left and right blocks at each level, as well as by pointers from parent to child blocks. Each block has the following fields: @@ -1004,14 +1004,14 @@ and .BR blockcount . .TP .B keys -[nonleaf blocks only] array of key records. These are the first value +[non-leaf blocks only] array of key records. These are the first value of each block in the level below this one. Each record contains .B startblock and .BR blockcount . .TP .B ptrs -[nonleaf blocks only] array of child block pointers. Each pointer is a +[non-leaf blocks only] array of child block pointers. Each pointer is a block number within the allocation group to the next level in the Btree. .PD .RE @@ -1021,7 +1021,7 @@ There is one set of filesystem blocks forming the by-block-count allocation Btree for each allocation group. The root block of this Btree is designated by the .B cntroot -field in the coresponding AGF block. The blocks are linked to sibling +field in the corresponding AGF block. The blocks are linked to sibling left and right blocks at each level, as well as by pointers from parent to child blocks. Each block has the following fields: .RS 1.4i @@ -1049,14 +1049,14 @@ and .BR blockcount . .TP .B keys -[nonleaf blocks only] array of key records. These are the first value +[non-leaf blocks only] array of key records. These are the first value of each block in the level below this one. Each record contains .B blockcount and .BR startblock . .TP .B ptrs -[nonleaf blocks only] array of child block pointers. Each pointer is a +[non-leaf blocks only] array of child block pointers. Each pointer is a block number within the allocation group to the next level in the Btree. .PD .RE @@ -1368,7 +1368,7 @@ number of warnings issued about realtime block limit violations. There is one set of filesystem blocks forming the inode allocation Btree for each allocation group. The root block of this Btree is designated by the .B root -field in the coresponding AGI block. +field in the corresponding AGI block. The blocks are linked to sibling left and right blocks at each level, as well as by pointers from parent to child blocks. Each block has the following fields: @@ -1400,12 +1400,12 @@ count of free inodes in this chunk, and bitmap, LSB corresponds to inode 0. .TP .B keys -[nonleaf blocks only] array of key records. These are the first value of each +[non-leaf blocks only] array of key records. These are the first value of each block in the level below this one. Each record contains .BR startino . .TP .B ptrs -[nonleaf blocks only] array of child block pointers. Each pointer is a +[non-leaf blocks only] array of child block pointers. Each pointer is a block number within the allocation group to the next level in the Btree. .PD .RE diff --git a/man/man8/xfs_mdrestore.8 b/man/man8/xfs_mdrestore.8 index a7d2b68..7b9ba89 100644 --- a/man/man8/xfs_mdrestore.8 +++ b/man/man8/xfs_mdrestore.8 @@ -16,7 +16,7 @@ to a filesystem. The .I source argument specifies the location of the metadump image and the .I target -argument specifies the destination for the filsystem image. +argument specifies the destination for the filesystem image. If the .I source is \-, then the metadata image is read from stdin. This allows the output of diff --git a/man/man8/xfs_quota.8 b/man/man8/xfs_quota.8 index f3b54cc..9327feb 100644 --- a/man/man8/xfs_quota.8 +++ b/man/man8/xfs_quota.8 @@ -623,7 +623,7 @@ can be used to limit recursion level (\-1 is infinite, 0 is top level only, 1 is first level ... ). Option .B \-p -adds posibility to specify project paths in command line without a need +adds possibility to specify project paths in command line without a need for .I /etc/projects to exist. Note that if projects file exists then it is also used. diff --git a/man/man8/xfs_repair.8 b/man/man8/xfs_repair.8 index 57c97da..7b296ba 100644 --- a/man/man8/xfs_repair.8 +++ b/man/man8/xfs_repair.8 @@ -170,7 +170,7 @@ Verbose output. Repair dangerously. Allow .B xfs_repair to repair an XFS filesystem mounted read only. This is typically done -on a root fileystem from single user mode, immediately followed by a reboot. +on a root filesystem from single user mode, immediately followed by a reboot. .TP .B \-V Prints out the current version number and exits. @@ -239,7 +239,7 @@ The name assigned is the inode number. aborts on most disk I/O errors. Therefore, if you are trying to repair a filesystem that was damaged due to a disk drive failure, steps should be taken to ensure that all blocks in the filesystem are -readable and writeable before attempting to use +readable and writable before attempting to use .B xfs_repair to repair the filesystem. A possible method is using .BR dd (8) _______________________________________________ xfs mailing list xfs@oss.sgi.com http://oss.sgi.com/mailman/listinfo/xfs ^ permalink raw reply related [flat|nested] 22+ messages in thread
* Re: [PATCH 1/3 V2] xfsprogs: manpage spelling fixes 2013-04-25 14:12 ` [PATCH 1/3 V2] " Eric Sandeen @ 2013-04-25 14:59 ` Rich Johnston 2013-04-25 20:43 ` Rich Johnston 1 sibling, 0 replies; 22+ messages in thread From: Rich Johnston @ 2013-04-25 14:59 UTC (permalink / raw) To: xfs Sorry for being so picky. Thanks for V2! Looks good. Reviewed-by: Rich Johnston <rjohnston@sgi.com> _______________________________________________ xfs mailing list xfs@oss.sgi.com http://oss.sgi.com/mailman/listinfo/xfs ^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PATCH 1/3 V2] xfsprogs: manpage spelling fixes 2013-04-25 14:12 ` [PATCH 1/3 V2] " Eric Sandeen 2013-04-25 14:59 ` Rich Johnston @ 2013-04-25 20:43 ` Rich Johnston 1 sibling, 0 replies; 22+ messages in thread From: Rich Johnston @ 2013-04-25 20:43 UTC (permalink / raw) To: Eric Sandeen; +Cc: xfs-oss Thanks Eric, V2 has been committed. --Rich commit 87342c3a5dcb5d6812e93c201ecd3e51d971e6d6 Author: Eric Sandeen <sandeen@sandeen.net> Date: Thu Apr 25 14:12:08 2013 +0000 xfsprogs: manpage spelling fixes _______________________________________________ xfs mailing list xfs@oss.sgi.com http://oss.sgi.com/mailman/listinfo/xfs ^ permalink raw reply [flat|nested] 22+ messages in thread
* [PATCH 2/3] xfsprogs: Fix manpages for missing or incorrect options 2013-04-22 22:37 [PATCH 0/3] xfsprogs: manpage & usage string fixups Eric Sandeen 2013-04-22 22:39 ` [PATCH 1/3] xfsprogs: manpage spelling fixes Eric Sandeen @ 2013-04-22 22:40 ` Eric Sandeen 2013-04-23 18:35 ` Rich Johnston 2013-04-25 15:03 ` [PATCH 2/3 V2] " Eric Sandeen 2013-04-22 22:42 ` [PATCH 3/3] xfsprogs: Fix up usage() errors and omissions Eric Sandeen 2 siblings, 2 replies; 22+ messages in thread From: Eric Sandeen @ 2013-04-22 22:40 UTC (permalink / raw) To: xfs-oss Add valid options which aren't in manpages, and remove invalid options which are in manpages: * Document -V (show version and exit) for many manpages. * Remove -? option from xfs_estimate.8 * Document -p passes, -d (debug) and -g (syslog) in xfs_fsr.8 * Document -n (O_NONBLOCK) in xfs_io.8 * Document -v (print overwrite) in xfs_logprint.8 * Document -m max_extents in xfs_metadump.8 * Document -p (preallocate) in xfs_mkfile.8 Signed-off-by: Eric Sandeeen <sandeen@redhat.com> --- diff --git a/man/man8/mkfs.xfs.8 b/man/man8/mkfs.xfs.8 index 7f3a4b4..add48cb 100644 --- a/man/man8/mkfs.xfs.8 +++ b/man/man8/mkfs.xfs.8 @@ -38,6 +38,8 @@ mkfs.xfs \- construct an XFS filesystem .B \-N ] [ .B \-K +] [ +.B \-V ] .I device .SH DESCRIPTION @@ -728,6 +730,9 @@ creating the file system. .TP .B \-K Do not attempt to discard blocks at mkfs time. +.TP +.B \-V +Prints the version number and exits. .SH SEE ALSO .BR xfs (5), .BR mkfs (8), diff --git a/man/man8/xfs_admin.8 b/man/man8/xfs_admin.8 index 2de907b..4b476f5 100644 --- a/man/man8/xfs_admin.8 +++ b/man/man8/xfs_admin.8 @@ -4,7 +4,7 @@ xfs_admin \- change parameters of an XFS filesystem .SH SYNOPSIS .B xfs_admin [ -.B \-eflpu +.B \-eflpuV ] [ .BR "\-c 0" | 1 ] [ @@ -97,6 +97,9 @@ The may also be .BR generate , which will generate a new UUID for the filesystem. +.TP +.B \-V +Prints the version number and exits. .PP The .BR mount (8) diff --git a/man/man8/xfs_bmap.8 b/man/man8/xfs_bmap.8 index ccaa79b..7a1e948 100644 --- a/man/man8/xfs_bmap.8 +++ b/man/man8/xfs_bmap.8 @@ -4,7 +4,7 @@ xfs_bmap \- print block mapping for an XFS file .SH SYNOPSIS .B xfs_bmap [ -.B \-adlpv +.B \-adlpvV ] [ .B \-n .I num_extents @@ -91,6 +91,9 @@ A second option will print out the .I flags legend. +.TP +.B \-V +Prints the version number and exits. .SH SEE ALSO .BR xfs_fsr (8), .BR xfs (5). diff --git a/man/man8/xfs_check.8 b/man/man8/xfs_check.8 index 1654532..6168f2e 100644 --- a/man/man8/xfs_check.8 +++ b/man/man8/xfs_check.8 @@ -16,6 +16,8 @@ xfs_check \- check XFS filesystem consistency ] [ .B \-v ] [ +.B \-V +] [ .B \-l .I logdev ] @@ -73,6 +75,9 @@ Specifies verbose output; it is impossibly long for a reasonably-sized filesystem. This option is intended for internal use only. .TP +.B \-V +Prints the version number and exits. +.TP .BI \-i " ino" Specifies verbose behavior for the specified inode .IR ino . diff --git a/man/man8/xfs_copy.8 b/man/man8/xfs_copy.8 index 3028db8..35edace 100644 --- a/man/man8/xfs_copy.8 +++ b/man/man8/xfs_copy.8 @@ -4,7 +4,7 @@ xfs_copy \- copy the contents of an XFS filesystem .SH SYNOPSIS .B xfs_copy [ -.B \-bd +.B \-bdV ] [ .B \-L .I log @@ -81,6 +81,9 @@ The buffered option can be used to ensure direct IO is not attempted to any of the target files. This is useful when the filesystem holding the target file does not support direct IO. .TP +.B \-V +Prints the version number and exits. +.TP .BI \-L " log" Specifies the location of the .I log diff --git a/man/man8/xfs_estimate.8 b/man/man8/xfs_estimate.8 index bb458ec..ca86d46 100644 --- a/man/man8/xfs_estimate.8 +++ b/man/man8/xfs_estimate.8 @@ -3,7 +3,7 @@ xfs_estimate \- estimate the space that an XFS filesystem will take .SH SYNOPSIS .nf -\f3xfs_estimate\f1 [ \f3\-h?\f1 ] [ \f3\-b\f1 blocksize ] [ \f3\-i\f1 logsize ] +\f3xfs_estimate\f1 [ \f3\-h\f1 ] [ \f3\-b\f1 blocksize ] [ \f3\-i\f1 logsize ] [ \f3\-e\f1 logsize ] [ \f3\-v\f1 ] directory ... .fi .SH DESCRIPTION @@ -51,9 +51,6 @@ Display more information, formatted. .B \-h Display usage message. .TP -.B \-? -Display usage message. -.TP \f3\-i, \-e\f1 \f2logsize\f1 Use .I logsize diff --git a/man/man8/xfs_freeze.8 b/man/man8/xfs_freeze.8 index 97c7911..d36eb60 100644 --- a/man/man8/xfs_freeze.8 +++ b/man/man8/xfs_freeze.8 @@ -2,9 +2,14 @@ .SH NAME xfs_freeze \- suspend access to an XFS filesystem .SH SYNOPSIS -.B xfs_freeze \-f +.B xfs_freeze +[ +.B \-V +] [ +.B \-f | .B \-u +] .I mount-point .fi .SH DESCRIPTION @@ -26,6 +31,10 @@ The filesystem must be mounted to be frozen (see .BR mount (8)). .PP The +.B \-V +flag prints the version number and exits. +.PP +The .B \-f flag requests the specified XFS filesystem to be frozen from new modifications. @@ -48,7 +57,9 @@ operations to continue. Any filesystem modifications that were blocked by the freeze are unblocked and allowed to complete. .PP -One of +Unless +.B \-V +is specified, one of .B \-f or .B \-u diff --git a/man/man8/xfs_fsr.8 b/man/man8/xfs_fsr.8 index bf5e942..f365274 100644 --- a/man/man8/xfs_fsr.8 +++ b/man/man8/xfs_fsr.8 @@ -3,9 +3,9 @@ xfs_fsr \- filesystem reorganizer for XFS .SH SYNOPSIS .nf -\f3xfs_fsr\f1 [\f3\-v\f1] \c -[\f3\-t\f1 seconds] [\f3\-f\f1 leftoff] [\f3\-m\f1 mtab] -\f3xfs_fsr\f1 [\f3\-v\f1] \c +\f3xfs_fsr\f1 [\f3\-vdg\f1] \c +[\f3\-t\f1 seconds] [\f3\-p\f1 passes] [\f3\-f\f1 leftoff] [\f3\-m\f1 mtab] +\f3xfs_fsr\f1 [\f3\-vdg\f1] \c [xfsdev | file] ... .fi .SH DESCRIPTION @@ -35,7 +35,11 @@ The default is to use .TP .BI \-t " seconds" How long to reorganize. -The default is 7200 (2 hours). +The default is 7200 seconds (2 hours). +.TP +.BI \-p " passes" +Number of passes before terminating global re-org. +The default is 10 passes. .TP .BI \-f " leftoff" Use this file instead of @@ -47,6 +51,12 @@ to store the state of where reorganization left off. Verbose. Print cryptic information about each file being reorganized. +.TP +.B \-d +Debug. Print even more cryptic information. +.TP +.B \-g +Print to syslog (default if stdout not a tty). .PP When invoked with no arguments .I xfs_fsr diff --git a/man/man8/xfs_growfs.8 b/man/man8/xfs_growfs.8 index b55438b..f7a82e9 100644 --- a/man/man8/xfs_growfs.8 +++ b/man/man8/xfs_growfs.8 @@ -39,6 +39,8 @@ xfs_growfs, xfs_info \- expand an XFS filesystem .br .B xfs_info [ +.B \-V +] [ .B \-t .I mtab ] diff --git a/man/man8/xfs_io.8 b/man/man8/xfs_io.8 index 33a5944..0d572c7 100644 --- a/man/man8/xfs_io.8 +++ b/man/man8/xfs_io.8 @@ -4,7 +4,7 @@ xfs_io \- debug the I/O path of an XFS filesystem .SH SYNOPSIS .B xfs_io [ -.B \-adfmrRstx +.B \-adfmrRstxV ] [ .B \-c .I cmd @@ -52,6 +52,9 @@ is immutable or append-only. .B \-x Expert mode. Dangerous commands are only available in this mode. These commands also tend to require additional privileges. +.TP +.B \-V +Prints the version number and exits. .PP The other .BR open (2) @@ -111,6 +114,9 @@ opens for synchronous I/O (O_SYNC). .B \-t truncates on open (O_TRUNC). .TP +.B \-n +opens in non-blocking mode if possible (O_NONBLOCK). +.TP .B \-R marks the file as a realtime XFS file after opening it, if it is not already marked as such. diff --git a/man/man8/xfs_logprint.8 b/man/man8/xfs_logprint.8 index c1a8077..16e881e 100644 --- a/man/man8/xfs_logprint.8 +++ b/man/man8/xfs_logprint.8 @@ -97,6 +97,12 @@ Override any notion of where to start printing. .TP .B \-t Print out the transactional view. +.TP +.B \-v +Print "overwrite" data. +.TP +.B \-V +Prints the version number and exits. .SH SEE ALSO .BR mkfs.xfs (8), .BR mount (8). diff --git a/man/man8/xfs_metadump.8 b/man/man8/xfs_metadump.8 index 9672713..b2c718a 100644 --- a/man/man8/xfs_metadump.8 +++ b/man/man8/xfs_metadump.8 @@ -6,6 +6,10 @@ xfs_metadump \- copy XFS filesystem metadata to a file [ .B \-efgow ] [ +.B \-m +.I max_extents +] +] [ .B \-l .I logdev ] @@ -94,6 +98,11 @@ For filesystems which use an external log, this specifies the device where the external log resides. The external log is not copied, only internal logs are copied. .TP +.B \-m +Set the maximum size of an allowed metadata extent. Extremely large metadata +extents are likely to be corrupt, and will be skipped if they exceed +this value. The default size is 1000 blocks. +.TP .B \-o Disables obfuscation of file names and extended attributes. .TP diff --git a/man/man8/xfs_mkfile.8 b/man/man8/xfs_mkfile.8 index 96f443f..1d2c501 100644 --- a/man/man8/xfs_mkfile.8 +++ b/man/man8/xfs_mkfile.8 @@ -7,6 +7,10 @@ xfs_mkfile \- create an XFS file .B \-v ] [ .B \-n +] [ +.B \-p +] [ +.B \-V ] .I size\c .RB [ k | b | m | g ] @@ -30,3 +34,10 @@ Verbose. Report the names and sizes of created files. .B \-n No bytes. Create a holey file - that is, do not write out any data, just seek to end of file and write a block. +.TP +.B \-p +Preallocate. The file is preallocated, then overwritten with zeroes, +then truncated to the desired size. +.TP +.B \-V +Prints the version number and exits. diff --git a/man/man8/xfs_ncheck.8 b/man/man8/xfs_ncheck.8 index 408919d..dfaed6a 100644 --- a/man/man8/xfs_ncheck.8 +++ b/man/man8/xfs_ncheck.8 @@ -11,6 +11,8 @@ xfs_ncheck \- generate pathnames from i-numbers for XFS ] [ .B \-s ] [ +.B \-V +] [ .B \-l .I logdev ] @@ -53,6 +55,9 @@ for a detailed description of the XFS log. Limits the report to special files and files with setuserid mode. This option may be used to detect violations of security policy. .TP +.B \-V +Prints the version number and exits. +.TP .BI \-i " ino" Limits the report to only those files whose inode numbers follow. May be given multiple times to select multiple inode numbers. diff --git a/man/man8/xfs_rtcp.8 b/man/man8/xfs_rtcp.8 index be81cb3..22ba12d 100644 --- a/man/man8/xfs_rtcp.8 +++ b/man/man8/xfs_rtcp.8 @@ -8,6 +8,8 @@ xfs_rtcp \- XFS realtime copy command .I extsize ] [ .B -p +] [ +.B -V ] .IR source " ... " target .SH DESCRIPTION @@ -35,6 +37,9 @@ will pad the destination file to a size which is an even multiple of the filesystem block size. This is necessary since the realtime file is created using direct I/O and the minimum I/O is the filesystem block size. +.TP +.B \-V +Prints the version number and exits. .SH SEE ALSO .BR xfs (5), .BR mkfs.xfs (8), _______________________________________________ xfs mailing list xfs@oss.sgi.com http://oss.sgi.com/mailman/listinfo/xfs ^ permalink raw reply related [flat|nested] 22+ messages in thread
* Re: [PATCH 2/3] xfsprogs: Fix manpages for missing or incorrect options 2013-04-22 22:40 ` [PATCH 2/3] xfsprogs: Fix manpages for missing or incorrect options Eric Sandeen @ 2013-04-23 18:35 ` Rich Johnston 2013-04-23 19:36 ` Eric Sandeen 2013-04-25 15:03 ` [PATCH 2/3 V2] " Eric Sandeen 1 sibling, 1 reply; 22+ messages in thread From: Rich Johnston @ 2013-04-23 18:35 UTC (permalink / raw) To: Eric Sandeen; +Cc: xfs-oss Hey Eric, Couple of comments. 1. The OPTIONS are listed in several ways, (alphabetical order, same order as they appear in the SYNOPSIS, ...). I don't really have a preference, but as long as we are cleaning up the manpages, I suggest we be consistent. (case insensitive alpha order maybe???) 2. How about making the -V option wording the same also? xfs_db and xfs_repair are: Prints out the current version number and exits. ^^^^^^^^ The others: man/man8/mkfs.xfs.8:Prints the version number and exits. man/man8/xfs_admin.8:Prints the version number and exits. man/man8/xfs_bmap.8:Prints the version number and exits. man/man8/xfs_check.8:Prints the version number and exits. man/man8/xfs_copy.8:Prints the version number and exits. man/man8/xfs_growfs.8:Prints the version number and exits. The man/man8/xfs_io.8:Prints the version number and exits. man/man8/xfs_logprint.8:Prints the version number and exits. man/man8/xfs_mkfile.8:Prints the version number and exits. man/man8/xfs_ncheck.8:Prints the version number and exits. man/man8/xfs_rtcp.8:Prints the version number and exits. 3. The following are missing the -V option in both the SYNOPSIS and OPTIONS sections. (I did verify the -V option works for all commands) man/man8/xfs_estimate.8 man/man8/xfs_freeze.8 man/man8/xfs_fsr.8 man/man8/xfs_mdrestore.8 man/man8/xfs_metadump.8 man/man8/xfs_quota.8 man/man8/xfs_repair.8 4. The -V prints the version and exits, shouldn't all the SYNOPSIS look like this for the -V option? SYNOPSIS xfs_db [ -c cmd ] ... [ -i|r|x|F ] [ -f ] [ -l logdev ] ... xfs_db -V Regards --Rich _______________________________________________ xfs mailing list xfs@oss.sgi.com http://oss.sgi.com/mailman/listinfo/xfs ^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PATCH 2/3] xfsprogs: Fix manpages for missing or incorrect options 2013-04-23 18:35 ` Rich Johnston @ 2013-04-23 19:36 ` Eric Sandeen 2013-04-23 19:45 ` Rich Johnston 0 siblings, 1 reply; 22+ messages in thread From: Eric Sandeen @ 2013-04-23 19:36 UTC (permalink / raw) To: Rich Johnston; +Cc: xfs-oss On 4/23/13 1:35 PM, Rich Johnston wrote: > Hey Eric, > > Couple of comments. > > 1. The OPTIONS are listed in several ways, (alphabetical order, same > order as they appear in the SYNOPSIS, ...). I don't really have a > preference, but as long as we are cleaning up the manpages, I suggest > we be consistent. (case insensitive alpha order maybe???) That'd make a fine followup patch, I agree! ;) Re-ordering every manpage won't really be on my todo list soon, though. > 2. How about making the -V option wording the same also? > xfs_db and xfs_repair are: > Prints out the current version number and exits. > ^^^^^^^^ I suppose. I'm not really sure anyone would care? > The others: > man/man8/mkfs.xfs.8:Prints the version number and exits. > man/man8/xfs_admin.8:Prints the version number and exits. > man/man8/xfs_bmap.8:Prints the version number and exits. > man/man8/xfs_check.8:Prints the version number and exits. > man/man8/xfs_copy.8:Prints the version number and exits. > man/man8/xfs_growfs.8:Prints the version number and exits. The > man/man8/xfs_io.8:Prints the version number and exits. > man/man8/xfs_logprint.8:Prints the version number and exits. > man/man8/xfs_mkfile.8:Prints the version number and exits. > man/man8/xfs_ncheck.8:Prints the version number and exits. > man/man8/xfs_rtcp.8:Prints the version number and exits. > > 3. The following are missing the -V option in both the SYNOPSIS and OPTIONS sections. > (I did verify the -V option works for all commands) > man/man8/xfs_estimate.8 > man/man8/xfs_freeze.8 > man/man8/xfs_fsr.8 > man/man8/xfs_mdrestore.8 > man/man8/xfs_metadump.8 > man/man8/xfs_quota.8 > man/man8/xfs_repair.8 not sure how I missed those, sorry. > > 4. The -V prints the version and exits, shouldn't all the SYNOPSIS look like this for the -V option? > > SYNOPSIS > xfs_db [ -c cmd ] ... [ -i|r|x|F ] [ -f ] [ -l logdev ] ... > xfs_db -V Probably. -V is least important of the fixes; I'd be more inclined to just drop the -V changes and not spend a couple more hours rearranging manpages. This was fine work on a plane, but there are more pressing things to do now :( Maybe some list-reader who wants some changelog glory could take this further? :) -Eric > Regards > --Rich > > _______________________________________________ > xfs mailing list > xfs@oss.sgi.com > http://oss.sgi.com/mailman/listinfo/xfs > _______________________________________________ xfs mailing list xfs@oss.sgi.com http://oss.sgi.com/mailman/listinfo/xfs ^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PATCH 2/3] xfsprogs: Fix manpages for missing or incorrect options 2013-04-23 19:36 ` Eric Sandeen @ 2013-04-23 19:45 ` Rich Johnston 0 siblings, 0 replies; 22+ messages in thread From: Rich Johnston @ 2013-04-23 19:45 UTC (permalink / raw) To: Eric Sandeen; +Cc: xfs-oss On 04/23/2013 02:36 PM, Eric Sandeen wrote: > On 4/23/13 1:35 PM, Rich Johnston wrote: >> Hey Eric, >> >> Couple of comments. >> >> 1. The OPTIONS are listed in several ways, (alphabetical order, same >> order as they appear in the SYNOPSIS, ...). I don't really have a >> preference, but as long as we are cleaning up the manpages, I suggest >> we be consistent. (case insensitive alpha order maybe???) > > That'd make a fine followup patch, I agree! ;) Re-ordering every > manpage won't really be on my todo list soon, though. > Sounds good. >> 2. How about making the -V option wording the same also? >> xfs_db and xfs_repair are: >> Prints out the current version number and exits. >> ^^^^^^^^ > > I suppose. I'm not really sure anyone would care? > Not important just noting it ;) >> The others: >> man/man8/mkfs.xfs.8:Prints the version number and exits. >> man/man8/xfs_admin.8:Prints the version number and exits. >> man/man8/xfs_bmap.8:Prints the version number and exits. >> man/man8/xfs_check.8:Prints the version number and exits. >> man/man8/xfs_copy.8:Prints the version number and exits. >> man/man8/xfs_growfs.8:Prints the version number and exits. The >> man/man8/xfs_io.8:Prints the version number and exits. >> man/man8/xfs_logprint.8:Prints the version number and exits. >> man/man8/xfs_mkfile.8:Prints the version number and exits. >> man/man8/xfs_ncheck.8:Prints the version number and exits. >> man/man8/xfs_rtcp.8:Prints the version number and exits. >> >> 3. The following are missing the -V option in both the SYNOPSIS and OPTIONS sections. >> (I did verify the -V option works for all commands) >> man/man8/xfs_estimate.8 >> man/man8/xfs_freeze.8 >> man/man8/xfs_fsr.8 >> man/man8/xfs_mdrestore.8 >> man/man8/xfs_metadump.8 >> man/man8/xfs_quota.8 >> man/man8/xfs_repair.8 > > not sure how I missed those, sorry. Do you have time to add these? This really the only todo for now I think. > >> >> 4. The -V prints the version and exits, shouldn't all the SYNOPSIS look like this for the -V option? >> >> SYNOPSIS >> xfs_db [ -c cmd ] ... [ -i|r|x|F ] [ -f ] [ -l logdev ] ... >> xfs_db -V > > Probably. -V is least important of the fixes; I'd be more inclined to just drop > the -V changes and not spend a couple more hours rearranging manpages. > > This was fine work on a plane, but there are more pressing things to do now :( Agreed > > Maybe some list-reader who wants some changelog glory could take this further? :) > Yes a follow up patch works for me, any volunteers? > -Eric > >> Regards >> --Rich >> >> _______________________________________________ >> xfs mailing list >> xfs@oss.sgi.com >> http://oss.sgi.com/mailman/listinfo/xfs >> > _______________________________________________ xfs mailing list xfs@oss.sgi.com http://oss.sgi.com/mailman/listinfo/xfs ^ permalink raw reply [flat|nested] 22+ messages in thread
* [PATCH 2/3 V2] xfsprogs: Fix manpages for missing or incorrect options 2013-04-22 22:40 ` [PATCH 2/3] xfsprogs: Fix manpages for missing or incorrect options Eric Sandeen 2013-04-23 18:35 ` Rich Johnston @ 2013-04-25 15:03 ` Eric Sandeen 2013-04-25 15:26 ` Rich Johnston 2013-04-25 15:52 ` Rich Johnston 1 sibling, 2 replies; 22+ messages in thread From: Eric Sandeen @ 2013-04-25 15:03 UTC (permalink / raw) To: xfs-oss Add valid options which aren't in manpages, and remove invalid options which are in manpages: * Document -V (show version and exit) for many manpages. * Remove -? option from xfs_estimate.8 * Document -p passes, -d (debug) and -g (syslog) in xfs_fsr.8 * Document -n (O_NONBLOCK) in xfs_io.8 * Document -v (print overwrite) in xfs_logprint.8 * Document -m max_extents in xfs_metadump.8 * Document -p (preallocate) in xfs_mkfile.8 Signed-off-by: Eric Sandeeen <sandeen@redhat.com> --- V2: move "-V" SYNOPSIS to their own line, move -V documentation to end of option documentation list diff --git a/man/man8/mkfs.xfs.8 b/man/man8/mkfs.xfs.8 index f707881..04c19b4 100644 --- a/man/man8/mkfs.xfs.8 +++ b/man/man8/mkfs.xfs.8 @@ -40,6 +40,8 @@ mkfs.xfs \- construct an XFS filesystem .B \-K ] .I device +.br +.B mkfs.xfs \-V .SH DESCRIPTION .B mkfs.xfs constructs an XFS filesystem by writing on a special @@ -728,6 +730,9 @@ creating the file system. .TP .B \-K Do not attempt to discard blocks at mkfs time. +.TP +.B \-V +Prints the version number and exits. .SH SEE ALSO .BR xfs (5), .BR mkfs (8), diff --git a/man/man8/xfs_admin.8 b/man/man8/xfs_admin.8 index 2de907b..b393d74 100644 --- a/man/man8/xfs_admin.8 +++ b/man/man8/xfs_admin.8 @@ -15,6 +15,8 @@ xfs_admin \- change parameters of an XFS filesystem .I uuid ] .I device +.br +.B xfs_admin \-V .SH DESCRIPTION .B xfs_admin uses the @@ -97,6 +99,9 @@ The may also be .BR generate , which will generate a new UUID for the filesystem. +.TP +.B \-V +Prints the version number and exits. .PP The .BR mount (8) diff --git a/man/man8/xfs_bmap.8 b/man/man8/xfs_bmap.8 index ccaa79b..e196559 100644 --- a/man/man8/xfs_bmap.8 +++ b/man/man8/xfs_bmap.8 @@ -10,6 +10,8 @@ xfs_bmap \- print block mapping for an XFS file .I num_extents ] .I file +.br +.B xfs_bmap \-V .SH DESCRIPTION .B xfs_bmap prints the map of disk blocks used by files in an XFS filesystem. @@ -91,6 +93,9 @@ A second option will print out the .I flags legend. +.TP +.B \-V +Prints the version number and exits. .SH SEE ALSO .BR xfs_fsr (8), .BR xfs (5). diff --git a/man/man8/xfs_check.8 b/man/man8/xfs_check.8 index 1654532..23027ca 100644 --- a/man/man8/xfs_check.8 +++ b/man/man8/xfs_check.8 @@ -20,6 +20,8 @@ xfs_check \- check XFS filesystem consistency .I logdev ] .I device +.br +.B xfs_check \-V .SH DESCRIPTION .B xfs_check checks whether an XFS filesystem is consistent. @@ -89,6 +91,9 @@ Conversion between disk addresses (i.e. addresses reported by and file system blocks may be accomplished using .BR xfs_db "(8)'s " convert command. +.TP +.B \-V +Prints the version number and exits. .PP Any output that is produced when .B xfs_check diff --git a/man/man8/xfs_copy.8 b/man/man8/xfs_copy.8 index 3028db8..1eaf85d 100644 --- a/man/man8/xfs_copy.8 +++ b/man/man8/xfs_copy.8 @@ -13,6 +13,8 @@ xfs_copy \- copy the contents of an XFS filesystem [ .I target2 \&... ] +.br +.B xfs_copy \-V .SH DESCRIPTION .B xfs_copy copies an XFS filesystem to one or more targets in parallel (see @@ -87,6 +89,9 @@ Specifies the location of the if the default location of .I /var/tmp/xfs_copy.log.XXXXXX is not desired. +.TP +.B \-V +Prints the version number and exits. .SH DIAGNOSTICS .B xfs_copy reports errors to both diff --git a/man/man8/xfs_db.8 b/man/man8/xfs_db.8 index 0558671..7a43a2c 100644 --- a/man/man8/xfs_db.8 +++ b/man/man8/xfs_db.8 @@ -103,7 +103,7 @@ and commands. .TP .B \-V -Prints out the current version number and exits. +Prints the version number and exits. .SH CONCEPTS .B xfs_db commands can be broken up into two classes. Most commands are for diff --git a/man/man8/xfs_estimate.8 b/man/man8/xfs_estimate.8 index bb458ec..2594eb8 100644 --- a/man/man8/xfs_estimate.8 +++ b/man/man8/xfs_estimate.8 @@ -3,8 +3,10 @@ xfs_estimate \- estimate the space that an XFS filesystem will take .SH SYNOPSIS .nf -\f3xfs_estimate\f1 [ \f3\-h?\f1 ] [ \f3\-b\f1 blocksize ] [ \f3\-i\f1 logsize ] +\f3xfs_estimate\f1 [ \f3\-h\f1 ] [ \f3\-b\f1 blocksize ] [ \f3\-i\f1 logsize ] [ \f3\-e\f1 logsize ] [ \f3\-v\f1 ] directory ... +.br +.B xfs_estimate \-V .fi .SH DESCRIPTION For each \f2directory\f1 argument, @@ -51,9 +53,6 @@ Display more information, formatted. .B \-h Display usage message. .TP -.B \-? -Display usage message. -.TP \f3\-i, \-e\f1 \f2logsize\f1 Use .I logsize @@ -77,6 +76,9 @@ For example, .IP requests an estimate of the space required by the directory / on an XFS filesystem using an internal log of 1 megabyte. +.TP +.B \-V +Print the version number and exits. .SH EXAMPLES .nf .sp 8v diff --git a/man/man8/xfs_freeze.8 b/man/man8/xfs_freeze.8 index 97c7911..c581ad7 100644 --- a/man/man8/xfs_freeze.8 +++ b/man/man8/xfs_freeze.8 @@ -2,10 +2,15 @@ .SH NAME xfs_freeze \- suspend access to an XFS filesystem .SH SYNOPSIS -.B xfs_freeze \-f +.B xfs_freeze +[ +.B \-f | .B \-u +] .I mount-point +.br +.B xfs_freeze \-V .fi .SH DESCRIPTION .B xfs_freeze @@ -25,6 +30,7 @@ is mounted. The filesystem must be mounted to be frozen (see .BR mount (8)). .PP +.PP The .B \-f flag requests the specified XFS filesystem to be @@ -48,7 +54,13 @@ operations to continue. Any filesystem modifications that were blocked by the freeze are unblocked and allowed to complete. .PP -One of +The +.B \-V +flag prints the version number and exits. +.PP +Unless +.B \-V +is specified, one of .B \-f or .B \-u diff --git a/man/man8/xfs_fsr.8 b/man/man8/xfs_fsr.8 index bf5e942..0a162b6 100644 --- a/man/man8/xfs_fsr.8 +++ b/man/man8/xfs_fsr.8 @@ -3,10 +3,12 @@ xfs_fsr \- filesystem reorganizer for XFS .SH SYNOPSIS .nf -\f3xfs_fsr\f1 [\f3\-v\f1] \c -[\f3\-t\f1 seconds] [\f3\-f\f1 leftoff] [\f3\-m\f1 mtab] -\f3xfs_fsr\f1 [\f3\-v\f1] \c +\f3xfs_fsr\f1 [\f3\-vdg\f1] \c +[\f3\-t\f1 seconds] [\f3\-p\f1 passes] [\f3\-f\f1 leftoff] [\f3\-m\f1 mtab] +\f3xfs_fsr\f1 [\f3\-vdg\f1] \c [xfsdev | file] ... +.br +.B xfs_fsr \-V .fi .SH DESCRIPTION .I xfs_fsr @@ -35,7 +37,11 @@ The default is to use .TP .BI \-t " seconds" How long to reorganize. -The default is 7200 (2 hours). +The default is 7200 seconds (2 hours). +.TP +.BI \-p " passes" +Number of passes before terminating global re-org. +The default is 10 passes. .TP .BI \-f " leftoff" Use this file instead of @@ -47,6 +53,16 @@ to store the state of where reorganization left off. Verbose. Print cryptic information about each file being reorganized. +.TP +.B \-d +Debug. Print even more cryptic information. +.TP +.B \-g +Print to syslog (default if stdout not a tty). +.TP +.B \-V +Prints the version number and exits. + .PP When invoked with no arguments .I xfs_fsr diff --git a/man/man8/xfs_growfs.8 b/man/man8/xfs_growfs.8 index b55438b..e23d30e 100644 --- a/man/man8/xfs_growfs.8 +++ b/man/man8/xfs_growfs.8 @@ -15,7 +15,7 @@ xfs_growfs, xfs_info \- expand an XFS filesystem .SH SYNOPSIS .B xfs_growfs [ -.B \-dilnrxV +.B \-dilnrx ] [ .B \-D .I size @@ -37,12 +37,17 @@ xfs_growfs, xfs_info \- expand an XFS filesystem ] .I mount-point .br +.B xfs_growfs \-V +.PP +.br .B xfs_info [ .B \-t .I mtab ] .I mount-point +.br +.B xfs_info \-V .SH DESCRIPTION .B xfs_growfs expands an existing XFS filesystem (see diff --git a/man/man8/xfs_io.8 b/man/man8/xfs_io.8 index 33a5944..5e3535b 100644 --- a/man/man8/xfs_io.8 +++ b/man/man8/xfs_io.8 @@ -13,6 +13,8 @@ xfs_io \- debug the I/O path of an XFS filesystem .I prog ] .I file +.br +.B xfs_io \-V .SH DESCRIPTION .B xfs_io is a debugging tool like @@ -52,6 +54,9 @@ is immutable or append-only. .B \-x Expert mode. Dangerous commands are only available in this mode. These commands also tend to require additional privileges. +.TP +.B \-V +Prints the version number and exits. .PP The other .BR open (2) @@ -111,6 +116,9 @@ opens for synchronous I/O (O_SYNC). .B \-t truncates on open (O_TRUNC). .TP +.B \-n +opens in non-blocking mode if possible (O_NONBLOCK). +.TP .B \-R marks the file as a realtime XFS file after opening it, if it is not already marked as such. diff --git a/man/man8/xfs_logprint.8 b/man/man8/xfs_logprint.8 index c1a8077..16e881e 100644 --- a/man/man8/xfs_logprint.8 +++ b/man/man8/xfs_logprint.8 @@ -97,6 +97,12 @@ Override any notion of where to start printing. .TP .B \-t Print out the transactional view. +.TP +.B \-v +Print "overwrite" data. +.TP +.B \-V +Prints the version number and exits. .SH SEE ALSO .BR mkfs.xfs (8), .BR mount (8). diff --git a/man/man8/xfs_mdrestore.8 b/man/man8/xfs_mdrestore.8 index 7b9ba89..51297c4 100644 --- a/man/man8/xfs_mdrestore.8 +++ b/man/man8/xfs_mdrestore.8 @@ -8,6 +8,8 @@ xfs_mdrestore \- restores an XFS metadump image to a filesystem image ] .I source .I target +.br +.B xfs_mdrestore \-V .SH DESCRIPTION .B xfs_mdrestore is a debugging tool that restores a metadata image generated by @@ -36,6 +38,9 @@ can be destroyed. .TP .B \-g Shows restore progress on stdout. +.TP +.B \-V +Prints the version number and exits. .SH DIAGNOSTICS .B xfs_mdrestore returns an exit code of 0 if all the metadata is successfully restored or diff --git a/man/man8/xfs_metadump.8 b/man/man8/xfs_metadump.8 index 9672713..26cea97 100644 --- a/man/man8/xfs_metadump.8 +++ b/man/man8/xfs_metadump.8 @@ -6,11 +6,17 @@ xfs_metadump \- copy XFS filesystem metadata to a file [ .B \-efgow ] [ +.B \-m +.I max_extents +] +] [ .B \-l .I logdev ] .I source .I target +.br +.B xfs_metadump \-V .SH DESCRIPTION .B xfs_metadump is a debugging tool that copies the metadata from an XFS filesystem to a file. @@ -94,12 +100,20 @@ For filesystems which use an external log, this specifies the device where the external log resides. The external log is not copied, only internal logs are copied. .TP +.B \-m +Set the maximum size of an allowed metadata extent. Extremely large metadata +extents are likely to be corrupt, and will be skipped if they exceed +this value. The default size is 1000 blocks. +.TP .B \-o Disables obfuscation of file names and extended attributes. .TP .B \-w Prints warnings of inconsistent metadata encountered to stderr. Bad metadata is still copied. +.TP +.B \-V +Prints the version number and exits. .SH DIAGNOSTICS .B xfs_metadump returns an exit code of 0 if all readable metadata is successfully copied or diff --git a/man/man8/xfs_mkfile.8 b/man/man8/xfs_mkfile.8 index 96f443f..abaa4e6 100644 --- a/man/man8/xfs_mkfile.8 +++ b/man/man8/xfs_mkfile.8 @@ -7,10 +7,14 @@ xfs_mkfile \- create an XFS file .B \-v ] [ .B \-n +] [ +.B \-p ] .I size\c .RB [ k | b | m | g ] .IR filename " ..." +.br +.B xfs_mkfile \-V .SH DESCRIPTION .B xfs_mkfile creates one or more files. The file is padded with zeroes by default. @@ -30,3 +34,10 @@ Verbose. Report the names and sizes of created files. .B \-n No bytes. Create a holey file - that is, do not write out any data, just seek to end of file and write a block. +.TP +.B \-p +Preallocate. The file is preallocated, then overwritten with zeroes, +then truncated to the desired size. +.TP +.B \-V +Prints the version number and exits. diff --git a/man/man8/xfs_ncheck.8 b/man/man8/xfs_ncheck.8 index 408919d..4099772 100644 --- a/man/man8/xfs_ncheck.8 +++ b/man/man8/xfs_ncheck.8 @@ -15,6 +15,8 @@ xfs_ncheck \- generate pathnames from i-numbers for XFS .I logdev ] .I device +.br +.B xfs_ncheck \-V .SH DESCRIPTION .B xfs_ncheck with no @@ -56,6 +58,9 @@ This option may be used to detect violations of security policy. .BI \-i " ino" Limits the report to only those files whose inode numbers follow. May be given multiple times to select multiple inode numbers. +.TP +.B \-V +Prints the version number and exits. .PP If the filesystem is seriously corrupted, or very busy and looks like it is corrupt, a message of the form that would be generated by diff --git a/man/man8/xfs_quota.8 b/man/man8/xfs_quota.8 index 9327feb..8cc8ab7 100644 --- a/man/man8/xfs_quota.8 +++ b/man/man8/xfs_quota.8 @@ -16,6 +16,8 @@ xfs_quota \- manage use of quota on XFS filesystems .I project ] ... [ .IR path " ... ]" +.br +.B xfs_quota \-V .SH DESCRIPTION .B xfs_quota is a utility for reporting and editing various aspects of filesystem quota. @@ -50,6 +52,9 @@ which restricts the output of the individual commands to the set of projects specified. Multiple .B \-d arguments may be given. +.TP +.B \-V +Prints the version number and exits. .PP The optional .I path diff --git a/man/man8/xfs_repair.8 b/man/man8/xfs_repair.8 index 7b296ba..96adb29 100644 --- a/man/man8/xfs_repair.8 +++ b/man/man8/xfs_repair.8 @@ -173,7 +173,7 @@ to repair an XFS filesystem mounted read only. This is typically done on a root filesystem from single user mode, immediately followed by a reboot. .TP .B \-V -Prints out the current version number and exits. +Prints the version number and exits. .SS Checks Performed Inconsistencies corrected include the following: .IP 1. diff --git a/man/man8/xfs_rtcp.8 b/man/man8/xfs_rtcp.8 index be81cb3..40e9097 100644 --- a/man/man8/xfs_rtcp.8 +++ b/man/man8/xfs_rtcp.8 @@ -10,6 +10,8 @@ xfs_rtcp \- XFS realtime copy command .B -p ] .IR source " ... " target +.br +.B xfs_rtcp \-V .SH DESCRIPTION .B xfs_rtcp copies a file to the realtime partition on an XFS filesystem. @@ -35,6 +37,9 @@ will pad the destination file to a size which is an even multiple of the filesystem block size. This is necessary since the realtime file is created using direct I/O and the minimum I/O is the filesystem block size. +.TP +.B \-V +Prints the version number and exits. .SH SEE ALSO .BR xfs (5), .BR mkfs.xfs (8), _______________________________________________ xfs mailing list xfs@oss.sgi.com http://oss.sgi.com/mailman/listinfo/xfs ^ permalink raw reply related [flat|nested] 22+ messages in thread
* Re: [PATCH 2/3 V2] xfsprogs: Fix manpages for missing or incorrect options 2013-04-25 15:03 ` [PATCH 2/3 V2] " Eric Sandeen @ 2013-04-25 15:26 ` Rich Johnston 2013-04-25 15:52 ` Rich Johnston 1 sibling, 0 replies; 22+ messages in thread From: Rich Johnston @ 2013-04-25 15:26 UTC (permalink / raw) To: Eric Sandeen; +Cc: xfs-oss Thanks Eric for posing V2. Looks good. Reviewed-by: Rich Johnston <rjohnston@sgi.com> _______________________________________________ xfs mailing list xfs@oss.sgi.com http://oss.sgi.com/mailman/listinfo/xfs ^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PATCH 2/3 V2] xfsprogs: Fix manpages for missing or incorrect options 2013-04-25 15:03 ` [PATCH 2/3 V2] " Eric Sandeen 2013-04-25 15:26 ` Rich Johnston @ 2013-04-25 15:52 ` Rich Johnston 1 sibling, 0 replies; 22+ messages in thread From: Rich Johnston @ 2013-04-25 15:52 UTC (permalink / raw) To: Eric Sandeen; +Cc: xfs-oss Thanks Eric for V2, it has been committed. --Rich commit eaa6a2bf5940dfa5e7a295834e68f317d4686218 Author: Eric Sandeen <sandeen@sandeen.net> Date: Thu Apr 25 15:03:47 2013 +0000 xfsprogs: Fix manpages for missing or incorrect options _______________________________________________ xfs mailing list xfs@oss.sgi.com http://oss.sgi.com/mailman/listinfo/xfs ^ permalink raw reply [flat|nested] 22+ messages in thread
* [PATCH 3/3] xfsprogs: Fix up usage() errors and omissions 2013-04-22 22:37 [PATCH 0/3] xfsprogs: manpage & usage string fixups Eric Sandeen 2013-04-22 22:39 ` [PATCH 1/3] xfsprogs: manpage spelling fixes Eric Sandeen 2013-04-22 22:40 ` [PATCH 2/3] xfsprogs: Fix manpages for missing or incorrect options Eric Sandeen @ 2013-04-22 22:42 ` Eric Sandeen 2013-04-23 19:37 ` Rich Johnston 2013-04-25 15:16 ` [PATCH 3/3 V2] " Eric Sandeen 2 siblings, 2 replies; 22+ messages in thread From: Eric Sandeen @ 2013-04-22 22:42 UTC (permalink / raw) To: xfs-oss Add missing options and remove invalid options in usage() output strings. * Add -V to several usage() strings * Remove deprecated/invalid -n and -s otions from xfs_fsr's usage * Remove invalid -I option from xfs_growfs's usage * Add -n (O_NONBLOCK) option to xfs_io's usage * Add -e (exit on error) option to xfs_logprint's usage * Remove invalid -b option from xfs_mdrestore's usage * Add -N (no-op), -K (no discard), and -f (force) to mkfs.xfs's usage * Add -x (expert) option to xfs_quota's usage Signed-off-by: Eric Sandeen <sandeen@redhat.com> --- diff --git a/copy/xfs_copy.c b/copy/xfs_copy.c index c01e0b9..7f65de3 100644 --- a/copy/xfs_copy.c +++ b/copy/xfs_copy.c @@ -301,7 +301,7 @@ void usage(void) { fprintf(stderr, - _("Usage: %s [-bd] [-L logfile] source target [target ...]\n"), + _("Usage: %s [-bdV] [-L logfile] source target [target ...]\n"), progname); exit(1); } diff --git a/db/init.c b/db/init.c index 2a31cb8..0e9e1a2 100644 --- a/db/init.c +++ b/db/init.c @@ -43,7 +43,7 @@ static void usage(void) { fprintf(stderr, _( - "Usage: %s [-fFrxV] [-p prog] [-l logdev] [-c cmd]... device\n" + "Usage: %s [-ifFrxV] [-p prog] [-l logdev] [-c cmd]... device\n" ), progname); exit(1); } diff --git a/fsr/xfs_fsr.c b/fsr/xfs_fsr.c index 3d017ca..2440bab 100644 --- a/fsr/xfs_fsr.c +++ b/fsr/xfs_fsr.c @@ -386,12 +386,9 @@ void usage(int ret) { fprintf(stderr, _( -"Usage: %s [-d] [-v] [-n] [-s] [-g] [-t time] [-p passes] [-f leftf] [-m mtab]\n" -" %s [-d] [-v] [-n] [-s] [-g] xfsdev | dir | file ...\n\n" +"Usage: %s [-d] [-v] [-g] [-t time] [-p passes] [-f leftf] [-m mtab]\n" +" %s [-d] [-v] [-g] xfsdev | dir | file ...\n\n" "Options:\n" -" -n Do nothing, only interesting with -v. Not\n" -" effective with in mtab mode.\n" -" -s Print statistics only.\n" " -g Print to syslog (default if stdout not a tty).\n" " -t time How long to run in seconds.\n" " -p passes Number of passes before terminating global re-org.\n" diff --git a/growfs/xfs_growfs.c b/growfs/xfs_growfs.c index a6d298b..5d544da 100644 --- a/growfs/xfs_growfs.c +++ b/growfs/xfs_growfs.c @@ -19,14 +19,6 @@ #include <xfs/libxfs.h> #include <xfs/path.h> -/* - * When growing a filesystem, this is the most significant - * bits we'll accept in the resulting inode numbers - * without warning the user. - */ - -#define XFS_MAX_INODE_SIG_BITS 32 - static void usage(void) { @@ -37,7 +29,6 @@ Options:\n\ -l grow log section\n\ -r grow realtime section\n\ -n don't change anything, just show geometry\n\ - -I allow inode numbers to exceed %d significant bits\n\ -i convert log from external to internal format\n\ -t alternate location for mount table (/etc/mtab)\n\ -x convert log from internal to external format\n\ @@ -47,7 +38,7 @@ Options:\n\ -e size set realtime extent size to size blks\n\ -m imaxpct set inode max percent to imaxpct\n\ -V print version information\n"), - progname, XFS_MAX_INODE_SIG_BITS); + progname); exit(2); } diff --git a/io/init.c b/io/init.c index fb93082..ca3055a 100644 --- a/io/init.c +++ b/io/init.c @@ -32,7 +32,7 @@ void usage(void) { fprintf(stderr, - _("Usage: %s [-adfmrRstx] [-p prog] [-c cmd]... file\n"), + _("Usage: %s [-adfmnrRstVx] [-p prog] [-c cmd]... file\n"), progname); exit(1); } diff --git a/io/xfs_freeze.sh b/io/xfs_freeze.sh index 45e20d2..647aa96 100644 --- a/io/xfs_freeze.sh +++ b/io/xfs_freeze.sh @@ -4,7 +4,7 @@ # OPTS="" -USAGE="Usage: xfs_freeze -f | -u <mountpoint>" +USAGE="Usage: xfs_freeze [-V] [-f | -u] <mountpoint>" DIRNAME=`dirname $0` VERSION=false FREEZE=false diff --git a/logprint/logprint.c b/logprint/logprint.c index 482fd4e..0923b0a 100644 --- a/logprint/logprint.c +++ b/logprint/logprint.c @@ -44,6 +44,7 @@ Options:\n\ -c try to continue if error found in log\n\ -C <filename> copy the log from the filesystem to filename\n\ -d dump the log in log-record format\n\ + -e exit when an error is found in the log\n\ -f specified device is actually a file\n\ -l <device> filename of external log\n\ -n don't try and interpret log data\n\ diff --git a/mdrestore/xfs_mdrestore.c b/mdrestore/xfs_mdrestore.c index 509a3ed..479e677 100644 --- a/mdrestore/xfs_mdrestore.c +++ b/mdrestore/xfs_mdrestore.c @@ -178,7 +178,7 @@ perform_restore( static void usage(void) { - fprintf(stderr, "Usage: %s [-bg] source target\n", progname); + fprintf(stderr, "Usage: %s [-V] [-g] source target\n", progname); exit(1); } diff --git a/mkfs/xfs_mkfs.c b/mkfs/xfs_mkfs.c index c57a855..09b5d5b 100644 --- a/mkfs/xfs_mkfs.c +++ b/mkfs/xfs_mkfs.c @@ -2911,6 +2911,9 @@ usage( void ) /* realtime subvol */ [-r extsize=num,size=num,rtdev=xxx]\n\ /* sectorsize */ [-s log=n|size=num]\n\ /* version */ [-V]\n\ +/* no-op info only */ [-N]\n\ +/* no discard */ [-K]\n\ +/* force overwrite */ [-f]\n\ devicename\n\ <devicename> is required unless -d name=xxx is given.\n\ <num> is xxx (bytes), xxxs (sectors), xxxb (fs blocks), xxxk (xxx KiB),\n\ diff --git a/quota/init.c b/quota/init.c index 0b481f7..aa99b1b 100644 --- a/quota/init.c +++ b/quota/init.c @@ -45,7 +45,7 @@ static void usage(void) { fprintf(stderr, - _("Usage: %s [-p prog] [-c cmd]... [-d project]... [path]\n"), + _("Usage: %s [-x] [-p prog] [-c cmd]... [-d project]... [path]\n"), progname); exit(1); } diff --git a/rtcp/xfs_rtcp.c b/rtcp/xfs_rtcp.c index 6ea7ab9..f0b5936 100644 --- a/rtcp/xfs_rtcp.c +++ b/rtcp/xfs_rtcp.c @@ -27,7 +27,7 @@ char *progname; void usage() { - fprintf(stderr, _("%s [-e extsize] [-p] source target\n"), progname); + fprintf(stderr, _("%s [-e extsize] [-p] [-V] source target\n"), progname); exit(2); } _______________________________________________ xfs mailing list xfs@oss.sgi.com http://oss.sgi.com/mailman/listinfo/xfs ^ permalink raw reply related [flat|nested] 22+ messages in thread
* Re: [PATCH 3/3] xfsprogs: Fix up usage() errors and omissions 2013-04-22 22:42 ` [PATCH 3/3] xfsprogs: Fix up usage() errors and omissions Eric Sandeen @ 2013-04-23 19:37 ` Rich Johnston 2013-04-25 15:16 ` [PATCH 3/3 V2] " Eric Sandeen 1 sibling, 0 replies; 22+ messages in thread From: Rich Johnston @ 2013-04-23 19:37 UTC (permalink / raw) To: Eric Sandeen; +Cc: xfs-oss On 04/22/2013 05:42 PM, Eric Sandeen wrote: > Add missing options and remove invalid options in usage() output > strings. > > * Add -V to several usage() strings Need to add it for xfs_estimate xfs_fsr xfs_quota I ran this. MYCMDS="mkfs.xfs xfs_admin xfs_bmap xfs_check xfs_copy xfs_db xfs_estimate xfs_freeze xfs_fsr xfs_growfs xfs_info xfs_io xfs_logprint xfs_mdrestore xfs_metadump xfs_mkfile xfs_ncheck xfs_quota xfs_rtcp" for i in $MYCMDS; do $i -h echo done Here are the cmds that are missing -V: > mkfs.xfs: invalid option -- 'h' > unknown option -h > Usage: mkfs.xfs > /* blocksize */ [-b log=n|size=num] > /* data subvol */ [-d agcount=n,agsize=n,file,name=xxx,size=num, > (sunit=value,swidth=value|su=num,sw=num), > sectlog=n|sectsize=num > /* inode size */ [-i log=n|perblock=n|size=num,maxpct=n,attr=0|1|2, > projid32bit=0|1] > /* log subvol */ [-l agnum=n,internal,size=num,logdev=xxx,version=n > sunit=value|su=num,sectlog=n|sectsize=num, > lazy-count=0|1] > /* label */ [-L label (maximum 12 characters)] > /* naming */ [-n log=n|size=num,version=2|ci] > /* prototype file */ [-p fname] > /* quiet */ [-q] > /* realtime subvol */ [-r extsize=num,size=num,rtdev=xxx] > /* sectorsize */ [-s log=n|size=num] > /* version */ [-V] > /* no-op info only */ [-N] > /* no discard */ [-K] > /* force overwrite */ [-f] > devicename > <devicename> is required unless -d name=xxx is given. > <num> is xxx (bytes), xxxs (sectors), xxxb (fs blocks), xxxk (xxx KiB), > xxxm (xxx MiB), xxxg (xxx GiB), xxxt (xxx TiB) or xxxp (xxx PiB). > <value> is xxx (512 byte blocks). > #rcj mkfs.xfs missing -V > Usage: xfs_estimate [opts] directory [directory ...] > -b blocksize (fundamental filesystem blocksize) > -i logsize (internal log size) > -e logsize (external log size) > -v prints more verbose messages > -h prints this usage message > > Note: blocksize may have 'k' appended to indicate x1024 > logsize may also have 'm' appended to indicate (1024 x 1024) #rcj xfs_estimate missing -V > xfs_fsr: invalid option -- 'h' > Usage: xfs_fsr [-d] [-v] [-g] [-t time] [-p passes] [-f leftf] [-m mtab] > xfs_fsr [-d] [-v] [-g] xfsdev | dir | file ... > > Options: > -g Print to syslog (default if stdout not a tty). > -t time How long to run in seconds. > -p passes Number of passes before terminating global re-org. > -f leftoff Use this instead of /var/tmp/.fsrlast_xfs. > -m mtab Use something other than /etc/mtab. > -d Debug, print even more. > -v Verbose, more -v's more verbose. > #rcj xfs_fsr missing -V > xfs_quota: invalid option -- 'h' > Usage: xfs_quota [-x] [-p prog] [-c cmd]... [-d project]... [path] #rcj missing -V _______________________________________________________________________ All commands report the version. MYCMDS="mkfs.xfs xfs_admin xfs_bmap xfs_check xfs_copy xfs_db xfs_estimate xfs_freeze xfs_fsr xfs_growfs xfs_info xfs_io xfs_logprint xfs_mdrestore xfs_metadump xfs_mkfile xfs_ncheck xfs_quota xfs_rtcp" for i in $MYCMDS; do $i -V done mkfs.xfs version 3.1.10 xfs_admin version 3.1.10 xfs_bmap version 3.1.10 xfs_check is deprecated and scheduled for removal in June 2014. Please use xfs_repair -n <dev> instead. xfs_check version 3.1.10 xfs_copy version 3.1.10 xfs_db version 3.1.10 xfs_estimate version 3.1.10 xfs_freeze version 3.1.10 xfs_fsr version 3.1.10 xfs_growfs version 3.1.10 xfs_info version 3.1.10 xfs_io version 3.1.10 xfs_logprint version 3.1.10 xfs_mdrestore version 3.1.10 xfs_metadump version 3.1.10 xfs_mkfile version 3.1.10 xfs_ncheck version 3.1.10 xfs_quota version 3.1.10 xfs_rtcp version 3.1.10 > * Remove deprecated/invalid -n and -s otions from xfs_fsr's usage #rcj OK > * Remove invalid -I option from xfs_growfs's usage #rcj OK > * Add -n (O_NONBLOCK) option to xfs_io's usage #rcj OK > * Add -e (exit on error) option to xfs_logprint's usage #rcj OK > * Remove invalid -b option from xfs_mdrestore's usage #rcj OK > * Add -N (no-op), -K (no discard), and -f (force) to mkfs.xfs's usage Usage: mkfs.xfs /* blocksize */ [-b log=n|size=num] /* data subvol */ [-d agcount=n,agsize=n,file,name=xxx,size=num, (sunit=value,swidth=value|su=num,sw=num), sectlog=n|sectsize=num /* force overwrite */ [-f] devicename #rcj move to here ????? /* inode size */ [-i log=n|perblock=n|size=num,maxpct=n,attr=0|1|2, projid32bit=0|1] /* no discard */ [-K] #rcj move to here ???? /* log subvol */ [-l agnum=n,internal,size=num,logdev=xxx,version=n sunit=value|su=num,sectlog=n|sectsize=num, lazy-count=0|1] /* label */ [-L label (maximum 12 characters)] /* naming */ [-n log=n|size=num,version=2|ci] /* no-op info only */ [-N] #rcj move to here ???? /* prototype file */ [-p fname] /* quiet */ [-q] /* realtime subvol */ [-r extsize=num,size=num,rtdev=xxx] /* sectorsize */ [-s log=n|size=num] /* version */ [-V] > * Add -x (expert) option to xfs_quota's usage #rcj OK Regards --Rich _______________________________________________ xfs mailing list xfs@oss.sgi.com http://oss.sgi.com/mailman/listinfo/xfs ^ permalink raw reply [flat|nested] 22+ messages in thread
* [PATCH 3/3 V2] xfsprogs: Fix up usage() errors and omissions 2013-04-22 22:42 ` [PATCH 3/3] xfsprogs: Fix up usage() errors and omissions Eric Sandeen 2013-04-23 19:37 ` Rich Johnston @ 2013-04-25 15:16 ` Eric Sandeen 2013-04-25 16:13 ` Rich Johnston 2013-04-25 16:15 ` Rich Johnston 1 sibling, 2 replies; 22+ messages in thread From: Eric Sandeen @ 2013-04-25 15:16 UTC (permalink / raw) To: xfs-oss Add missing options and remove invalid options in usage() output strings. * Add -V to several usage() strings * Remove deprecated/invalid -n and -s otions from xfs_fsr's usage * Remove invalid -I option from xfs_growfs's usage * Add -n (O_NONBLOCK) option to xfs_io's usage * Add -e (exit on error) option to xfs_logprint's usage * Remove invalid -b option from xfs_mdrestore's usage * Add -N (no-op), -K (no discard), and -f (force) to mkfs.xfs's usage * Add -x (expert) option to xfs_quota's usage Signed-off-by: Eric Sandeen <sandeen@redhat.com> --- V2: address Rich's nitpicky review ;) (i.e. fix good stuff) diff --git a/copy/xfs_copy.c b/copy/xfs_copy.c index c01e0b9..7f65de3 100644 --- a/copy/xfs_copy.c +++ b/copy/xfs_copy.c @@ -301,7 +301,7 @@ void usage(void) { fprintf(stderr, - _("Usage: %s [-bd] [-L logfile] source target [target ...]\n"), + _("Usage: %s [-bdV] [-L logfile] source target [target ...]\n"), progname); exit(1); } diff --git a/db/init.c b/db/init.c index 2a31cb8..0e9e1a2 100644 --- a/db/init.c +++ b/db/init.c @@ -43,7 +43,7 @@ static void usage(void) { fprintf(stderr, _( - "Usage: %s [-fFrxV] [-p prog] [-l logdev] [-c cmd]... device\n" + "Usage: %s [-ifFrxV] [-p prog] [-l logdev] [-c cmd]... device\n" ), progname); exit(1); } diff --git a/estimate/xfs_estimate.c b/estimate/xfs_estimate.c index 54a72e9..ddc6f62 100644 --- a/estimate/xfs_estimate.c +++ b/estimate/xfs_estimate.c @@ -78,6 +78,7 @@ usage(char *progname) "\t-i logsize (internal log size)\n" "\t-e logsize (external log size)\n" "\t-v prints more verbose messages\n" + "\t-V prints version and exits\n" "\t-h prints this usage message\n\n" "Note:\tblocksize may have 'k' appended to indicate x1024\n" "\tlogsize may also have 'm' appended to indicate (1024 x 1024)\n"), diff --git a/fsr/xfs_fsr.c b/fsr/xfs_fsr.c index 3d017ca..6852b3f 100644 --- a/fsr/xfs_fsr.c +++ b/fsr/xfs_fsr.c @@ -386,20 +386,19 @@ void usage(int ret) { fprintf(stderr, _( -"Usage: %s [-d] [-v] [-n] [-s] [-g] [-t time] [-p passes] [-f leftf] [-m mtab]\n" -" %s [-d] [-v] [-n] [-s] [-g] xfsdev | dir | file ...\n\n" +"Usage: %s [-d] [-v] [-g] [-t time] [-p passes] [-f leftf] [-m mtab]\n" +" %s [-d] [-v] [-g] xfsdev | dir | file ...\n" +" %s -V\n\n" "Options:\n" -" -n Do nothing, only interesting with -v. Not\n" -" effective with in mtab mode.\n" -" -s Print statistics only.\n" " -g Print to syslog (default if stdout not a tty).\n" " -t time How long to run in seconds.\n" -" -p passes Number of passes before terminating global re-org.\n" +" -p passes Number of passes before terminating global re-org.\n" " -f leftoff Use this instead of %s.\n" " -m mtab Use something other than /etc/mtab.\n" " -d Debug, print even more.\n" -" -v Verbose, more -v's more verbose.\n" - ), progname, progname, _PATH_FSRLAST); +" -v Verbose, more -v's more verbose.\n" +" -V Print version number and exit.\n" + ), progname, progname, progname, _PATH_FSRLAST); exit(ret); } diff --git a/growfs/xfs_growfs.c b/growfs/xfs_growfs.c index a6d298b..5d544da 100644 --- a/growfs/xfs_growfs.c +++ b/growfs/xfs_growfs.c @@ -19,14 +19,6 @@ #include <xfs/libxfs.h> #include <xfs/path.h> -/* - * When growing a filesystem, this is the most significant - * bits we'll accept in the resulting inode numbers - * without warning the user. - */ - -#define XFS_MAX_INODE_SIG_BITS 32 - static void usage(void) { @@ -37,7 +29,6 @@ Options:\n\ -l grow log section\n\ -r grow realtime section\n\ -n don't change anything, just show geometry\n\ - -I allow inode numbers to exceed %d significant bits\n\ -i convert log from external to internal format\n\ -t alternate location for mount table (/etc/mtab)\n\ -x convert log from internal to external format\n\ @@ -47,7 +38,7 @@ Options:\n\ -e size set realtime extent size to size blks\n\ -m imaxpct set inode max percent to imaxpct\n\ -V print version information\n"), - progname, XFS_MAX_INODE_SIG_BITS); + progname); exit(2); } diff --git a/io/init.c b/io/init.c index fb93082..ca3055a 100644 --- a/io/init.c +++ b/io/init.c @@ -32,7 +32,7 @@ void usage(void) { fprintf(stderr, - _("Usage: %s [-adfmrRstx] [-p prog] [-c cmd]... file\n"), + _("Usage: %s [-adfmnrRstVx] [-p prog] [-c cmd]... file\n"), progname); exit(1); } diff --git a/io/xfs_freeze.sh b/io/xfs_freeze.sh index 45e20d2..647aa96 100644 --- a/io/xfs_freeze.sh +++ b/io/xfs_freeze.sh @@ -4,7 +4,7 @@ # OPTS="" -USAGE="Usage: xfs_freeze -f | -u <mountpoint>" +USAGE="Usage: xfs_freeze [-V] [-f | -u] <mountpoint>" DIRNAME=`dirname $0` VERSION=false FREEZE=false diff --git a/logprint/logprint.c b/logprint/logprint.c index 482fd4e..0923b0a 100644 --- a/logprint/logprint.c +++ b/logprint/logprint.c @@ -44,6 +44,7 @@ Options:\n\ -c try to continue if error found in log\n\ -C <filename> copy the log from the filesystem to filename\n\ -d dump the log in log-record format\n\ + -e exit when an error is found in the log\n\ -f specified device is actually a file\n\ -l <device> filename of external log\n\ -n don't try and interpret log data\n\ diff --git a/mdrestore/xfs_mdrestore.c b/mdrestore/xfs_mdrestore.c index 509a3ed..479e677 100644 --- a/mdrestore/xfs_mdrestore.c +++ b/mdrestore/xfs_mdrestore.c @@ -178,7 +178,7 @@ perform_restore( static void usage(void) { - fprintf(stderr, "Usage: %s [-bg] source target\n", progname); + fprintf(stderr, "Usage: %s [-V] [-g] source target\n", progname); exit(1); } diff --git a/mkfs/xfs_mkfs.c b/mkfs/xfs_mkfs.c index c57a855..a393607 100644 --- a/mkfs/xfs_mkfs.c +++ b/mkfs/xfs_mkfs.c @@ -2899,13 +2899,16 @@ usage( void ) /* data subvol */ [-d agcount=n,agsize=n,file,name=xxx,size=num,\n\ (sunit=value,swidth=value|su=num,sw=num),\n\ sectlog=n|sectsize=num\n\ +/* force overwrite */ [-f]\n\ /* inode size */ [-i log=n|perblock=n|size=num,maxpct=n,attr=0|1|2,\n\ projid32bit=0|1]\n\ +/* no discard */ [-K]\n\ /* log subvol */ [-l agnum=n,internal,size=num,logdev=xxx,version=n\n\ sunit=value|su=num,sectlog=n|sectsize=num,\n\ lazy-count=0|1]\n\ /* label */ [-L label (maximum 12 characters)]\n\ /* naming */ [-n log=n|size=num,version=2|ci]\n\ +/* no-op info only */ [-N]\n\ /* prototype file */ [-p fname]\n\ /* quiet */ [-q]\n\ /* realtime subvol */ [-r extsize=num,size=num,rtdev=xxx]\n\ diff --git a/quota/init.c b/quota/init.c index 0b481f7..639e9e7 100644 --- a/quota/init.c +++ b/quota/init.c @@ -45,7 +45,7 @@ static void usage(void) { fprintf(stderr, - _("Usage: %s [-p prog] [-c cmd]... [-d project]... [path]\n"), + _("Usage: %s [-V] [-x] [-p prog] [-c cmd]... [-d project]... [path]\n"), progname); exit(1); } diff --git a/rtcp/xfs_rtcp.c b/rtcp/xfs_rtcp.c index 6ea7ab9..f0b5936 100644 --- a/rtcp/xfs_rtcp.c +++ b/rtcp/xfs_rtcp.c @@ -27,7 +27,7 @@ char *progname; void usage() { - fprintf(stderr, _("%s [-e extsize] [-p] source target\n"), progname); + fprintf(stderr, _("%s [-e extsize] [-p] [-V] source target\n"), progname); exit(2); } _______________________________________________ xfs mailing list xfs@oss.sgi.com http://oss.sgi.com/mailman/listinfo/xfs ^ permalink raw reply related [flat|nested] 22+ messages in thread
* Re: [PATCH 3/3 V2] xfsprogs: Fix up usage() errors and omissions 2013-04-25 15:16 ` [PATCH 3/3 V2] " Eric Sandeen @ 2013-04-25 16:13 ` Rich Johnston 2013-04-25 16:15 ` Rich Johnston 1 sibling, 0 replies; 22+ messages in thread From: Rich Johnston @ 2013-04-25 16:13 UTC (permalink / raw) To: Eric Sandeen; +Cc: xfs-oss On 04/25/2013 10:16 AM, Eric Sandeen wrote: > Add missing options and remove invalid options in usage() output > strings. > > * Add -V to several usage() strings > * Remove deprecated/invalid -n and -s otions from xfs_fsr's usage > * Remove invalid -I option from xfs_growfs's usage > * Add -n (O_NONBLOCK) option to xfs_io's usage > * Add -e (exit on error) option to xfs_logprint's usage > * Remove invalid -b option from xfs_mdrestore's usage > * Add -N (no-op), -K (no discard), and -f (force) to mkfs.xfs's usage > * Add -x (expert) option to xfs_quota's usage > > Signed-off-by: Eric Sandeen <sandeen@redhat.com> > --- > > V2: address Rich's nitpicky review ;) (i.e. fix good stuff) Thanks again for V2. Looks good. Reviewed-by: Rich Johnston <rjohnston@sgi.com> _______________________________________________ xfs mailing list xfs@oss.sgi.com http://oss.sgi.com/mailman/listinfo/xfs ^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PATCH 3/3 V2] xfsprogs: Fix up usage() errors and omissions 2013-04-25 15:16 ` [PATCH 3/3 V2] " Eric Sandeen 2013-04-25 16:13 ` Rich Johnston @ 2013-04-25 16:15 ` Rich Johnston 1 sibling, 0 replies; 22+ messages in thread From: Rich Johnston @ 2013-04-25 16:15 UTC (permalink / raw) To: Eric Sandeen; +Cc: xfs-oss Thanks Eric, this has been committed. --Rich commit 30626ef667746c51a6b93e21fc95eb5607c0002a Author: Eric Sandeen <sandeen@sandeen.net> Date: Thu Apr 25 15:16:34 2013 +0000 xfsprogs: Fix up usage() errors and omissions _______________________________________________ xfs mailing list xfs@oss.sgi.com http://oss.sgi.com/mailman/listinfo/xfs ^ permalink raw reply [flat|nested] 22+ messages in thread
end of thread, other threads:[~2013-04-25 20:43 UTC | newest] Thread overview: 22+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2013-04-22 22:37 [PATCH 0/3] xfsprogs: manpage & usage string fixups Eric Sandeen 2013-04-22 22:39 ` [PATCH 1/3] xfsprogs: manpage spelling fixes Eric Sandeen 2013-04-23 15:18 ` Rich Johnston 2013-04-23 15:43 ` Dave Howorth 2013-04-23 15:59 ` Rich Johnston 2013-04-23 16:20 ` Stefan Ring 2013-04-23 19:36 ` Eric Sandeen 2013-04-25 14:12 ` [PATCH 1/3 V2] " Eric Sandeen 2013-04-25 14:59 ` Rich Johnston 2013-04-25 20:43 ` Rich Johnston 2013-04-22 22:40 ` [PATCH 2/3] xfsprogs: Fix manpages for missing or incorrect options Eric Sandeen 2013-04-23 18:35 ` Rich Johnston 2013-04-23 19:36 ` Eric Sandeen 2013-04-23 19:45 ` Rich Johnston 2013-04-25 15:03 ` [PATCH 2/3 V2] " Eric Sandeen 2013-04-25 15:26 ` Rich Johnston 2013-04-25 15:52 ` Rich Johnston 2013-04-22 22:42 ` [PATCH 3/3] xfsprogs: Fix up usage() errors and omissions Eric Sandeen 2013-04-23 19:37 ` Rich Johnston 2013-04-25 15:16 ` [PATCH 3/3 V2] " Eric Sandeen 2013-04-25 16:13 ` Rich Johnston 2013-04-25 16:15 ` Rich Johnston
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox