public inbox for cluster-cvs@sourceware.org
help / color / mirror / Atom feed
* cluster: STABLE2 - qdiskd: Warn if we find >1 label with the same name
@ 2009-02-27 14:51 Lon Hohberger
0 siblings, 0 replies; 2+ messages in thread
From: Lon Hohberger @ 2009-02-27 14:51 UTC (permalink / raw)
To: cluster-cvs-relay
Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=abfd395f0dca54a3bdb9d47b52b2d49818a932e2
Commit: abfd395f0dca54a3bdb9d47b52b2d49818a932e2
Parent: 9cf3a5850186714bbadfec75f427d481d3c5468a
Author: Lon Hohberger <lhh@redhat.com>
AuthorDate: Thu Feb 26 15:23:59 2009 -0500
Committer: Lon Hohberger <lhh@redhat.com>
CommitterDate: Fri Feb 27 09:49:12 2009 -0500
qdiskd: Warn if we find >1 label with the same name
Signed-off-by: Lon Hohberger <lhh@redhat.com>
---
cman/qdisk/main.c | 8 ++++++++
cman/qdisk/proc.c | 4 ++--
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/cman/qdisk/main.c b/cman/qdisk/main.c
index e26e1fc..4964595 100644
--- a/cman/qdisk/main.c
+++ b/cman/qdisk/main.c
@@ -1471,8 +1471,16 @@ 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 2f0b6b0..583cf2d 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 1;
+ return dargs.count;
not_found:
if (dh) {
^ permalink raw reply [flat|nested] 2+ messages in thread
* cluster: STABLE2 - qdiskd: Warn if we find >1 label with the same name
@ 2009-02-27 15:03 Lon Hohberger
0 siblings, 0 replies; 2+ messages in thread
From: Lon Hohberger @ 2009-02-27 15:03 UTC (permalink / raw)
To: cluster-cvs-relay
Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=02a1c9e46bd6b8644dade2578d07a36856f9fed1
Commit: 02a1c9e46bd6b8644dade2578d07a36856f9fed1
Parent: 7d1c1c20719ff4d714df7bfd698eb6c39124294f
Author: Lon Hohberger <lhh@redhat.com>
AuthorDate: Fri Feb 27 10:01:43 2009 -0500
Committer: Lon Hohberger <lhh@redhat.com>
CommitterDate: Fri Feb 27 10:01:43 2009 -0500
qdiskd: Warn if we find >1 label with the same name
Signed-off-by: Lon Hohberger <lhh@redhat.com>
---
cman/qdisk/main.c | 7 +++++--
cman/qdisk/proc.c | 4 ++--
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/cman/qdisk/main.c b/cman/qdisk/main.c
index e26e1fc..70cc052 100644
--- a/cman/qdisk/main.c
+++ b/cman/qdisk/main.c
@@ -1471,8 +1471,11 @@ main(int argc, char **argv)
ctx.qc_label);
check_stop_cman(&ctx);
goto out;
- }
- /* 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);
+ }
if (ctx.qc_device)
free(ctx.qc_device);
diff --git a/cman/qdisk/proc.c b/cman/qdisk/proc.c
index 2f0b6b0..583cf2d 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 1;
+ return dargs.count;
not_found:
if (dh) {
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2009-02-27 15:03 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2009-02-27 14:51 cluster: STABLE2 - qdiskd: Warn if we find >1 label with the same name Lon Hohberger
2009-02-27 15:03 Lon Hohberger
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).