RHEL5 - qdisk: fix block size check

RHEL5 - qdisk: fix block size check

[Lon Hohberger]

Gitweb:        http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=13b41e52f270a8f70dfced64d799ec06e65624af
Commit:        13b41e52f270a8f70dfced64d799ec06e65624af
Parent:        39344881850283002c0578cc41f61c067948612a
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:53:51 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 3d9096d..3727563 100644
--- a/cman/qdisk/main.c
+++ b/cman/qdisk/main.c
@@ -1543,12 +1543,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);
 			goto out;
 		}