From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 23233 invoked by alias); 27 May 2009 10:20:33 -0000 Received: (qmail 23213 invoked by alias); 27 May 2009 10:20:32 -0000 X-SWARE-Spam-Status: No, hits=-1.4 required=5.0 tests=AWL,BAYES_00,J_CHICKENPOX_24,SPF_HELO_PASS X-Spam-Status: No, hits=-1.4 required=5.0 tests=AWL,BAYES_00,J_CHICKENPOX_24,SPF_HELO_PASS X-Spam-Check-By: sourceware.org X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on bastion2.fedora.phx.redhat.com Subject: cluster: STABLE3 - fsck: Fix up merge issue To: cluster-cvs-relay@redhat.com X-Project: Cluster Project X-Git-Module: cluster.git X-Git-Refname: refs/heads/STABLE3 X-Git-Reftype: branch X-Git-Oldrev: 599a05c55f4ed804b2efb80eec5733f7219ac8a3 X-Git-Newrev: 987b5478c3e572b0288c20aeadadf4eeb5841760 From: Steven Whitehouse Message-Id: <20090527102001.46BC1120364@lists.fedorahosted.org> Date: Wed, 27 May 2009 10:20:00 -0000 X-Scanned-By: MIMEDefang 2.58 on 172.16.52.254 Mailing-List: contact cluster-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: cluster-cvs-owner@sourceware.org X-SW-Source: 2009-q2/txt/msg00419.txt.bz2 Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=987b5478c3e572b0288c20aeadadf4eeb5841760 Commit: 987b5478c3e572b0288c20aeadadf4eeb5841760 Parent: 599a05c55f4ed804b2efb80eec5733f7219ac8a3 Author: Steven Whitehouse AuthorDate: Wed May 27 10:11:56 2009 +0100 Committer: Steven Whitehouse CommitterDate: Wed May 27 10:11:56 2009 +0100 fsck: Fix up merge issue Signed-off-by: Steven Whitehouse --- 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; }