cluster: STABLE3 - fsck: Fix up merge issue

Steven Whitehouse swhiteho@fedoraproject.org
Wed May 27 10:20:00 GMT 2009


Gitweb:        http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=987b5478c3e572b0288c20aeadadf4eeb5841760
Commit:        987b5478c3e572b0288c20aeadadf4eeb5841760
Parent:        599a05c55f4ed804b2efb80eec5733f7219ac8a3
Author:        Steven Whitehouse <swhiteho@redhat.com>
AuthorDate:    Wed May 27 10:11:56 2009 +0100
Committer:     Steven Whitehouse <swhiteho@redhat.com>
CommitterDate: Wed May 27 10:11:56 2009 +0100

fsck: Fix up merge issue

Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
---
 gfs2/fsck/main.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/gfs2/fsck/main.c b/gfs2/fsck/main.c
index b0f7856..c85e6de 100644
--- a/gfs2/fsck/main.c
+++ b/gfs2/fsck/main.c
@@ -91,7 +91,7 @@ static int read_cmdline(int argc, char **argv, struct gfs2_options *gopts)
 	}
 	if(argc > optind) {
 		gopts->device = (argv[optind]);
-		if(!opts->device) {
+		if(!gopts->device) {
 			fprintf(stderr, _("Please use '-h' for usage.\n"));
 			return FSCK_USAGE;
 		}



More information about the Cluster-cvs mailing list