diff options
| author |   Christian Zoffoli <xmerlin@gentoo.org> | 2008-11-22 00:36:09 +0000 |
|---|---|---|
| committer | Christian Zoffoli <xmerlin@gentoo.org> | 2008-11-22 00:36:09 +0000 |
| commit | 90531202dadffbc18907c5ccbff6d5a20f969f43 (patch) | |
| tree | 6e5fc7eb60b891309192aa4b32db8b83b825ff66 /sys-cluster/cman/files | |
| parent | Version bump, use EAPI 2, honor LDFLAGS, fix --as-needed (bug #246904). (diff) | |
| download | gentoo-2-90531202dadffbc18907c5ccbff6d5a20f969f43.tar.gz gentoo-2-90531202dadffbc18907c5ccbff6d5a20f969f43.tar.bz2 gentoo-2-90531202dadffbc18907c5ccbff6d5a20f969f43.zip | |
Renamed patch, fixed qdisk block size check RH bug #470533.
(Portage version: 2.1.4.4)
Diffstat (limited to 'sys-cluster/cman/files')
| -rw-r--r-- | sys-cluster/cman/files/cman-2.02.39-RH_bug_457107.patch (renamed from sys-cluster/cman/files/cman-2.02.39-bug457107.patch) | 0 | ||||
| -rw-r--r-- | sys-cluster/cman/files/cman-2.02.39-qdisk-fix-block-size-check-RH_bug_470533.patch | 33 |
2 files changed, 33 insertions, 0 deletions
diff --git a/sys-cluster/cman/files/cman-2.02.39-bug457107.patch b/sys-cluster/cman/files/cman-2.02.39-RH_bug_457107.patch index 40a4159a16a3..40a4159a16a3 100644 --- a/sys-cluster/cman/files/cman-2.02.39-bug457107.patch +++ b/sys-cluster/cman/files/cman-2.02.39-RH_bug_457107.patch diff --git a/sys-cluster/cman/files/cman-2.02.39-qdisk-fix-block-size-check-RH_bug_470533.patch b/sys-cluster/cman/files/cman-2.02.39-qdisk-fix-block-size-check-RH_bug_470533.patch new file mode 100644 index 000000000000..072951bce205 --- /dev/null +++ b/sys-cluster/cman/files/cman-2.02.39-qdisk-fix-block-size-check-RH_bug_470533.patch @@ -0,0 +1,33 @@ +From: Lon Hohberger <lhh@redhat.com> +Date: Fri, 7 Nov 2008 17:53:51 +0000 (-0500) +Subject: qdisk: fix block size check +X-Git-Url: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff_plain;h=c90643c8824ff2f12e2debc05f32f981facfcbd3 + +qdisk: fix block size check + +When using device="" instead of label="", this check was causing +qdiskd to incorrectly exit. + +Resolves: #470533 +--- + +diff --git a/cman/qdisk/main.c b/cman/qdisk/main.c +index 0e27cb7..e26e1fc 100644 +--- a/cman/qdisk/main.c ++++ b/cman/qdisk/main.c +@@ -1491,12 +1491,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; + } |