public inbox for cluster-cvs@sourceware.org help / color / mirror / Atom feed
From: Lon Hohberger <lon@fedoraproject.org> To: cluster-cvs-relay@redhat.com Subject: cluster: STABLE2 - Revert "qdiskd: Warn if we find >1 label with the same name" Date: Fri, 27 Feb 2009 15:02:00 -0000 [thread overview] Message-ID: <20090227150232.91BF4120154@lists.fedorahosted.org> (raw) Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=7d1c1c20719ff4d714df7bfd698eb6c39124294f Commit: 7d1c1c20719ff4d714df7bfd698eb6c39124294f Parent: bc8dc2a4c6f850319d53538e16e70080f0c03cee Author: Lon Hohberger <lhh@redhat.com> AuthorDate: Fri Feb 27 10:01:09 2009 -0500 Committer: Lon Hohberger <lhh@redhat.com> CommitterDate: Fri Feb 27 10:01:09 2009 -0500 Revert "qdiskd: Warn if we find >1 label with the same name" This reverts commit abfd395f0dca54a3bdb9d47b52b2d49818a932e2. --- cman/qdisk/main.c | 8 -------- cman/qdisk/proc.c | 4 ++-- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/cman/qdisk/main.c b/cman/qdisk/main.c index 4964595..e26e1fc 100644 --- a/cman/qdisk/main.c +++ b/cman/qdisk/main.c @@ -1471,16 +1471,8 @@ main(int argc, char **argv) ctx.qc_label); check_stop_cman(&ctx); goto out; -<<<<<<< HEAD:cman/qdisk/main.c } /* XXX Multiple matches: do we care? */ -======= - } else if (ret > 0) { - clulog_and_print(LOG_WARNING, "%d matches found for " - "label '%s'; please use 'device=' " - "instead!\n", ret, ctx.qc_label); - } ->>>>>>> da3d354... qdiskd: Warn if we find >1 label with the same name:cman/qdisk/main.c if (ctx.qc_device) free(ctx.qc_device); diff --git a/cman/qdisk/proc.c b/cman/qdisk/proc.c index 583cf2d..2f0b6b0 100644 --- a/cman/qdisk/proc.c +++ b/cman/qdisk/proc.c @@ -228,7 +228,7 @@ find_partitions(const char *label, char *devname, size_t devlen, int print) } } - if (dargs.count >= 1 && label) { + if (dargs.count == 1 && label) { snprintf(devname, devlen, "%s", dargs.devnode->devpath->path); } @@ -245,7 +245,7 @@ find_partitions(const char *label, char *devname, size_t devlen, int print) return 0; /* more than one match */ - return dargs.count; + return 1; not_found: if (dh) {
reply other threads:[~2009-02-27 15:02 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20090227150232.91BF4120154@lists.fedorahosted.org \ --to=lon@fedoraproject.org \ --cc=cluster-cvs-relay@redhat.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).