Merge tag 'dlm-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm

4bdeb312 · Linus Torvalds <[email protected]> · 2014-06-13 07:41:57 -07:00

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

Commit: 4bdeb312083e65fccbb0a4b4043568f60520c67a
Parents: aa569fa0 · 883854c5

Merge commit. Changes below are compared with the first parent: aa569fa0.

Changes

1 files changed · +5 −0

File	Status	Add	Del	Content
fs/dlm/lowcomms.c	modified	+5	−0	View file

fs/dlm/lowcomms.c

View file

diff --git a/fs/dlm/lowcomms.c b/fs/dlm/lowcomms.c
index 1e5b453..d08e079 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,
 	int nodeid = sn_send_failed->ssf_info.sinfo_ppid;
 
 	log_print("Retry sending %d bytes to node id %d", len, nodeid);
+	
+	if (!nodeid) {
+		log_print("Shouldn't resend data via listening connection.");
+		return;
+	}
 
 	con = nodeid2con(nodeid, 0);
 	if (!con) {