diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-06-13 10:41:57 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-06-13 10:41:57 -0400 |
commit | 4bdeb312083e65fccbb0a4b4043568f60520c67a (patch) | |
tree | ed123e56179e3c28e37da57942bb3eabc7bebb3a /fs | |
parent | aa569fa0ea32d1c24fb801a07d2d9174cbbdde23 (diff) | |
parent | 883854c5457a97190f7b0ee20f03bcd9664fc0c2 (diff) |
Merge tag 'dlm-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm
Pull dlm fix from David Teigland:
"This contains one small fix related to resending SCTP messages"
* tag 'dlm-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm:
dlm: keep listening connection alive with sctp mode
Diffstat (limited to 'fs')
-rw-r--r-- | fs/dlm/lowcomms.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/fs/dlm/lowcomms.c b/fs/dlm/lowcomms.c index 1e5b45359509..d08e079ea5d3 100644 --- a/fs/dlm/lowcomms.c +++ b/fs/dlm/lowcomms.c | |||
@@ -617,6 +617,11 @@ static void retry_failed_sctp_send(struct connection *recv_con, | |||
617 | int nodeid = sn_send_failed->ssf_info.sinfo_ppid; | 617 | int nodeid = sn_send_failed->ssf_info.sinfo_ppid; |
618 | 618 | ||
619 | log_print("Retry sending %d bytes to node id %d", len, nodeid); | 619 | log_print("Retry sending %d bytes to node id %d", len, nodeid); |
620 | |||
621 | if (!nodeid) { | ||
622 | log_print("Shouldn't resend data via listening connection."); | ||
623 | return; | ||
624 | } | ||
620 | 625 | ||
621 | con = nodeid2con(nodeid, 0); | 626 | con = nodeid2con(nodeid, 0); |
622 | if (!con) { | 627 | if (!con) { |