From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 20721 invoked by alias); 27 Mar 2009 17:58:09 -0000 Received: (qmail 20577 invoked by alias); 27 Mar 2009 17:58:08 -0000 X-SWARE-Spam-Status: No, hits=-1.6 required=5.0 tests=AWL,BAYES_00,J_CHICKENPOX_63,SPF_HELO_PASS X-Spam-Status: No, hits=-1.6 required=5.0 tests=AWL,BAYES_00,J_CHICKENPOX_63,SPF_HELO_PASS X-Spam-Check-By: sourceware.org X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on bastion.fedora.phx.redhat.com Subject: gfs2-utils: master - gfs_control: ls failure should exit with failure To: cluster-cvs-relay@redhat.com X-Project: Cluster Project X-Git-Module: gfs2-utils.git X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: d41021fc051e6f9d70d085f1eac2d89360ba527b X-Git-Newrev: ffea6443e07a15fd85cbf1e19794caf30737cbf1 From: David Teigland Message-Id: <20090327175743.C3E4012020C@lists.fedorahosted.org> Date: Fri, 27 Mar 2009 17:58: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-q1/txt/msg00935.txt.bz2 Gitweb: http://git.fedorahosted.org/git/gfs2-utils.git?p=gfs2-utils.git;a=commitdiff;h=ffea6443e07a15fd85cbf1e19794caf30737cbf1 Commit: ffea6443e07a15fd85cbf1e19794caf30737cbf1 Parent: d41021fc051e6f9d70d085f1eac2d89360ba527b Author: David Teigland AuthorDate: Fri Mar 27 11:37:15 2009 -0500 Committer: David Teigland CommitterDate: Fri Mar 27 12:53:35 2009 -0500 gfs_control: ls failure should exit with failure exit code of list command can be used to check if gfs_controld is running Signed-off-by: David Teigland --- group/gfs_control/main.c | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/group/gfs_control/main.c b/group/gfs_control/main.c index 4bfb392..a910efc 100644 --- a/group/gfs_control/main.c +++ b/group/gfs_control/main.c @@ -376,16 +376,15 @@ static void do_list(char *name) memset(mgs, 0, sizeof(mgs)); if (name) { - rv = gfsc_mountgroup_info(name, mgs); - if (rv < 0) - return; mg_count = 1; + rv = gfsc_mountgroup_info(name, mgs); } else { rv = gfsc_mountgroups(MAX_MG, &mg_count, mgs); - if (rv < 0) - return; } + if (rv < 0) + exit(EXIT_FAILURE); /* gfs_controld probably not running */ + if (mg_count) printf("gfs mountgroups\n");