This is the mail archive of the
cluster-cvs@sourceware.org
mailing list for the cluster.
master - fence_tool/dlm_tool/gfs_control: remove error message
- From: David Teigland <teigland at fedoraproject dot org>
- To: cluster-cvs-relay at redhat dot com
- Date: Wed, 8 Oct 2008 20:05:25 +0000 (UTC)
- Subject: master - fence_tool/dlm_tool/gfs_control: remove error message
Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=aa24deb8511d8fca8e027a954747648a04ad7988
Commit: aa24deb8511d8fca8e027a954747648a04ad7988
Parent: 0c80e08741cb0619a2f973b2d0f15d35894b694c
Author: David Teigland <teigland@redhat.com>
AuthorDate: Wed Oct 8 11:20:07 2008 -0500
Committer: David Teigland <teigland@redhat.com>
CommitterDate: Wed Oct 8 11:20:07 2008 -0500
fence_tool/dlm_tool/gfs_control: remove error message
for the 'ls' command when the daemon isn't running.
Signed-off-by: David Teigland <teigland@redhat.com>
---
dlm/tool/main.c | 8 ++------
fence/fence_tool/fence_tool.c | 2 +-
group/gfs_control/main.c | 8 ++------
3 files changed, 5 insertions(+), 13 deletions(-)
diff --git a/dlm/tool/main.c b/dlm/tool/main.c
index f916fce..b274da0 100644
--- a/dlm/tool/main.c
+++ b/dlm/tool/main.c
@@ -629,12 +629,12 @@ static void do_list(char *name)
if (name) {
rv = dlmc_lockspace_info(name, lss);
if (rv < 0)
- goto out;
+ return;
ls_count = 1;
} else {
rv = dlmc_lockspaces(MAX_LS, &ls_count, lss);
if (rv < 0)
- goto out;
+ return;
}
if (ls_count)
@@ -665,10 +665,6 @@ static void do_list(char *name)
next:
printf("\n");
}
- return;
- out:
- fprintf(stderr, "dlm_controld query error %d\n", rv);
-
}
static void do_deadlock_check(char *name)
diff --git a/fence/fence_tool/fence_tool.c b/fence/fence_tool/fence_tool.c
index ec470c1..b4ce113 100644
--- a/fence/fence_tool/fence_tool.c
+++ b/fence/fence_tool/fence_tool.c
@@ -396,7 +396,7 @@ static int do_list(void)
rv = fenced_domain_info(&d);
if (rv < 0)
- goto fail;
+ exit(EXIT_SUCCESS); /* fenced probably not running */
printf("fence domain\n");
printf("member count %d\n", d.member_count);
diff --git a/group/gfs_control/main.c b/group/gfs_control/main.c
index d0c1d8b..650e144 100644
--- a/group/gfs_control/main.c
+++ b/group/gfs_control/main.c
@@ -338,12 +338,12 @@ static void do_list(char *name)
if (name) {
rv = gfsc_mountgroup_info(name, mgs);
if (rv < 0)
- goto out;
+ return;
mg_count = 1;
} else {
rv = gfsc_mountgroups(MAX_MG, &mg_count, mgs);
if (rv < 0)
- goto out;
+ return;
}
if (mg_count)
@@ -374,10 +374,6 @@ static void do_list(char *name)
next:
printf("\n");
}
- return;
- out:
- fprintf(stderr, "gfs_controld query error %d\n", rv);
-
}
static void do_plocks(char *name)