[Ocfs2-tools-commits] zab commits r640 - trunk/fsck.ocfs2

[svn-commits at oss.oracle.com]

Author: zab
Signed-off-by: manish
Signed-off-by: jlbec
Date: 2005-03-15 14:21:51 -0600 (Tue, 15 Mar 2005)
New Revision: 640

Modified:
   trunk/fsck.ocfs2/fsck.c
   trunk/fsck.ocfs2/fsck.ocfs2.8.in
Log:
o trivial fsck.ocfs2 option help text and man page updates
o get rid of 'preen' as it doesn't work anything like ext2s and
  we don't want people to be confused

Signed-off-by: manish
Signed-off-by: jlbec


Modified: trunk/fsck.ocfs2/fsck.c
===================================================================
--- trunk/fsck.ocfs2/fsck.c	2005-03-08 07:44:26 UTC (rev 639)
+++ trunk/fsck.ocfs2/fsck.c	2005-03-15 20:21:51 UTC (rev 640)
@@ -73,7 +73,7 @@
 static void print_usage(void)
 {
 	fprintf(stderr,
-		"Usage: fsck.ocfs2 [ -fGnpuvy ] [ -b superblock block ]\n"
+		"Usage: fsck.ocfs2 [ -fGnuvVy ] [ -b superblock block ]\n"
 		"		    [ -B block size ] device\n"
 		"\n"
 		"Critical flags for emergency repair:\n" 
@@ -87,6 +87,7 @@
 		" -G		Ask to fix mismatched inode generations\n"
 		" -u		Access the device with buffering\n"
 		" -V		Output fsck.ocfs2's version\n"
+		" -v		Provide verbose debugging output\n"
 		);
 }
 
@@ -429,7 +430,7 @@
 	setlinebuf(stderr);
 	setlinebuf(stdout);
 
-	while((c = getopt(argc, argv, "b:B:fGnpuvVy")) != EOF) {
+	while((c = getopt(argc, argv, "b:B:fGnuvVy")) != EOF) {
 		switch (c) {
 			case 'b':
 				blkno = read_number(optarg);
@@ -470,12 +471,6 @@
 				open_flags |= OCFS2_FLAG_RO;
 				break;
 
-			/* "preen" don't ask and force fixing */
-			case 'p':
-				ost->ost_ask = 0;
-				ost->ost_answer = 1;
-				break;
-
 			case 'y':
 				ost->ost_ask = 0;
 				ost->ost_answer = 1;

Modified: trunk/fsck.ocfs2/fsck.ocfs2.8.in
===================================================================
--- trunk/fsck.ocfs2/fsck.ocfs2.8.in	2005-03-08 07:44:26 UTC (rev 639)
+++ trunk/fsck.ocfs2/fsck.ocfs2.8.in	2005-03-15 20:21:51 UTC (rev 640)
@@ -2,7 +2,7 @@
 .SH "NAME"
 fsck.ocfs2 \- Check an OCFS2 file system.
 .SH "SYNOPSIS"
-\fBfsck.ocfs2\fR [ \fB\-fGnpuvy\fR ] [ \fB\-b\fR \fIsuperblock block\fR ] [ \fB\-B\fR \fIblock size\fR ] \fIdevice\fR
+\fBfsck.ocfs2\fR [ \fB\-fGnuvVy\fR ] [ \fB\-b\fR \fIsuperblock block\fR ] [ \fB\-B\fR \fIblock size\fR ] \fIdevice\fR
 .SH "DESCRIPTION"
 .PP 
 \fBfsck.ocfs2\fR is used to check an OCFS2 file system.
@@ -40,10 +40,6 @@
 to produce a record of a file system's faults.
 
 .TP
-\fB\-p\fR
-Automatically repair ("preen") the file system without asking any questions.  This is currently identical to giving the \fB\-y\fR option.
-
-.TP
 \fB\-y\fR 
 Give the 'yes' answer to all questions that fsck will ask.  This will repair
 all faults that \fBfsck.ocfs2\fR finds but will not give the operator a chance to intervene if \fBfsck.ocfs2\fR decides that it wants to drastically repair the file system.