Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJiri Slaby <jslaby@suse.cz>2014-07-09 09:23:23 +0200
committerMichal Marek <mmarek@suse.cz>2014-07-09 13:43:04 +0200
commitc36987dc9f1f1f7fc8b2be8cc756cadf4b52002e (patch)
tree999bda6cc4bbaf32e126098a675127022a752298
parente42f1200c55d3477318d28b54c22b78dc9caa7f2 (diff)
Refresh patches.fixes/dlm-abort-listening-connection.patch.
The hunk was misplaced: nodeid was used before check.
-rw-r--r--patches.fixes/dlm-abort-listening-connection.patch11
1 files changed, 5 insertions, 6 deletions
diff --git a/patches.fixes/dlm-abort-listening-connection.patch b/patches.fixes/dlm-abort-listening-connection.patch
index 9f7be3df06..6b51c86cfb 100644
--- a/patches.fixes/dlm-abort-listening-connection.patch
+++ b/patches.fixes/dlm-abort-listening-connection.patch
@@ -13,21 +13,20 @@ when nodeid was zero.
Signed-off-by: Lidong Zhong <lzhong@suse.com>
Signed-off-by: David Teigland <teigland@redhat.com>
---
- fs/dlm/lowcomms.c | 7 +++++++
- 1 file changed, 7 insertions(+)
+ fs/dlm/lowcomms.c | 5 +++++
+ 1 file changed, 5 insertions(+)
--- a/fs/dlm/lowcomms.c
+++ b/fs/dlm/lowcomms.c
-@@ -619,6 +619,12 @@ static void retry_failed_sctp_send(struc
+@@ -622,6 +622,11 @@ static void retry_failed_sctp_send(struc
+
log_print("Retry sending %d bytes to node id %d", len, nodeid);
- con = nodeid2con(nodeid, 0);
-+
+ if (!nodeid) {
+ log_print("Shouldn't resend data via listening connection.");
+ return;
+ }
+
+ con = nodeid2con(nodeid, 0);
if (!con) {
log_print("Could not look up con for nodeid %d\n",
- nodeid);