1 |
xmerlin 08/11/22 00:36:09 |
2 |
|
3 |
Added: |
4 |
cman-2.02.39-qdisk-fix-block-size-check-RH_bug_470533.patch |
5 |
cman-2.02.39-RH_bug_457107.patch |
6 |
Removed: cman-2.02.39-bug457107.patch |
7 |
Log: |
8 |
Renamed patch, fixed qdisk block size check RH bug #470533. |
9 |
(Portage version: 2.1.4.4) |
10 |
|
11 |
Revision Changes Path |
12 |
1.1 sys-cluster/cman/files/cman-2.02.39-qdisk-fix-block-size-check-RH_bug_470533.patch |
13 |
|
14 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-cluster/cman/files/cman-2.02.39-qdisk-fix-block-size-check-RH_bug_470533.patch?rev=1.1&view=markup |
15 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-cluster/cman/files/cman-2.02.39-qdisk-fix-block-size-check-RH_bug_470533.patch?rev=1.1&content-type=text/plain |
16 |
|
17 |
Index: cman-2.02.39-qdisk-fix-block-size-check-RH_bug_470533.patch |
18 |
=================================================================== |
19 |
From: Lon Hohberger <lhh@××××××.com> |
20 |
Date: Fri, 7 Nov 2008 17:53:51 +0000 (-0500) |
21 |
Subject: qdisk: fix block size check |
22 |
X-Git-Url: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff_plain;h=c90643c8824ff2f12e2debc05f32f981facfcbd3 |
23 |
|
24 |
qdisk: fix block size check |
25 |
|
26 |
When using device="" instead of label="", this check was causing |
27 |
qdiskd to incorrectly exit. |
28 |
|
29 |
Resolves: #470533 |
30 |
--- |
31 |
|
32 |
diff --git a/cman/qdisk/main.c b/cman/qdisk/main.c |
33 |
index 0e27cb7..e26e1fc 100644 |
34 |
--- a/cman/qdisk/main.c |
35 |
+++ b/cman/qdisk/main.c |
36 |
@@ -1491,12 +1491,12 @@ main(int argc, char **argv) |
37 |
} |
38 |
|
39 |
if (qh.qh_version == VERSION_MAGIC_V2 && |
40 |
- qh.qh_blksz != rv) { |
41 |
+ qh.qh_blksz != qh.qh_kernsz) { |
42 |
clulog(LOG_CRIT, |
43 |
- "Specified device %s does match kernel's " |
44 |
+ "Specified device %s does not match kernel's " |
45 |
"reported sector size (%d != %d)\n", |
46 |
ctx.qc_device, |
47 |
- ctx.qc_disk.d_blksz, rv); |
48 |
+ qh.qh_blksz, qh.qh_kernsz); |
49 |
check_stop_cman(&ctx); |
50 |
goto out; |
51 |
} |
52 |
|
53 |
|
54 |
|
55 |
1.1 sys-cluster/cman/files/cman-2.02.39-RH_bug_457107.patch |
56 |
|
57 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-cluster/cman/files/cman-2.02.39-RH_bug_457107.patch?rev=1.1&view=markup |
58 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-cluster/cman/files/cman-2.02.39-RH_bug_457107.patch?rev=1.1&content-type=text/plain |
59 |
|
60 |
Index: cman-2.02.39-RH_bug_457107.patch |
61 |
=================================================================== |
62 |
--- cluster-2.03.09/cman/daemon/commands.c.orig 2008-11-18 14:59:52.000000000 +0100 |
63 |
+++ cluster-2.03.09/cman/daemon/commands.c 2008-11-18 15:00:27.000000000 +0100 |
64 |
@@ -1729,8 +1729,7 @@ |
65 |
|
66 |
/* Newer nodes 6.1.0 onwards, set the DIRTY flag if they have state. If the new node has been down |
67 |
and has state then we mark it disallowed because we cannot merge stateful nodes */ |
68 |
- if ( (msg->flags & NODE_FLAGS_DIRTY && (node->flags & NODE_FLAGS_BEENDOWN)) || |
69 |
- (msg->flags & NODE_FLAGS_DIRTY && msg->first_trans && !node->us)) { |
70 |
+ if ( msg->flags & NODE_FLAGS_DIRTY && (node->flags & NODE_FLAGS_BEENDOWN)) { |
71 |
/* Don't duplicate messages */ |
72 |
if (node->state != NODESTATE_AISONLY) { |
73 |
if (cluster_is_quorate) { |