This is the mail archive of the
cluster-cvs@sourceware.org
mailing list for the cluster.
RHEL4 - qdisk: fix block size check
- From: Lon Hohberger <lon at fedoraproject dot org>
- To: cluster-cvs-relay at redhat dot com
- Date: Fri, 7 Nov 2008 17:59:11 +0000 (UTC)
- Subject: RHEL4 - qdisk: fix block size check
Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=80822ae142db4e94119f7eca6dfb0779b7be73e1
Commit: 80822ae142db4e94119f7eca6dfb0779b7be73e1
Parent: dc755d5cd100aeac58e48cfcd923d47aafa668a3
Author: Lon Hohberger <lhh@redhat.com>
AuthorDate: Fri Nov 7 12:53:51 2008 -0500
Committer: Lon Hohberger <lhh@redhat.com>
CommitterDate: Fri Nov 7 12:58:48 2008 -0500
qdisk: fix block size check
When using device="" instead of label="", this check was causing
qdiskd to incorrectly exit.
Resolves: #470533
---
cman/qdisk/main.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/cman/qdisk/main.c b/cman/qdisk/main.c
index 7b0a6ce..92be995 100644
--- a/cman/qdisk/main.c
+++ b/cman/qdisk/main.c
@@ -1531,12 +1531,12 @@ main(int argc, char **argv)
}
if (qh.qh_version == VERSION_MAGIC_V2 &&
- qh.qh_blksz != rv) {
+ qh.qh_blksz != qh.qh_kernsz) {
clulog(LOG_CRIT,
- "Specified device %s does match kernel's "
+ "Specified device %s does not match kernel's "
"reported sector size (%d != %d)\n",
ctx.qc_device,
- ctx.qc_disk.d_blksz, rv);
+ qh.qh_blksz, qh.qh_kernsz);
check_stop_cman(&ctx);
return -1;
}