浏览代码

dlm: fix lowcomms_connect_node for sctp

The recently added dlm_lowcomms_connect_node() from
391fbdc5d527149578490db2f1619951d91f3561 does not work
when using SCTP instead of TCP.  The sctp connection code
has nothing to do without data to send.  Check for no data
in the sctp connection code and do nothing instead of
triggering a BUG.  Also have connect_node() do nothing
when the protocol is sctp.

Signed-off-by: David Teigland <teigland@redhat.com>
David Teigland 15 年之前
父节点
当前提交
04bedd79a7
共有 1 个文件被更改,包括 10 次插入3 次删除
  1. 10 3
      fs/dlm/lowcomms.c

+ 10 - 3
fs/dlm/lowcomms.c

@@ -316,6 +316,10 @@ int dlm_lowcomms_connect_node(int nodeid)
 {
 {
 	struct connection *con;
 	struct connection *con;
 
 
+	/* with sctp there's no connecting without sending */
+	if (dlm_config.ci_protocol != 0)
+		return 0;
+
 	if (nodeid == dlm_our_nodeid())
 	if (nodeid == dlm_our_nodeid())
 		return 0;
 		return 0;
 
 
@@ -855,11 +859,14 @@ static void sctp_init_assoc(struct connection *con)
 	outmessage.msg_flags = MSG_EOR;
 	outmessage.msg_flags = MSG_EOR;
 
 
 	spin_lock(&con->writequeue_lock);
 	spin_lock(&con->writequeue_lock);
-	e = list_entry(con->writequeue.next, struct writequeue_entry,
-		       list);
 
 
-	BUG_ON((struct list_head *) e == &con->writequeue);
+	if (list_empty(&con->writequeue)) {
+		spin_unlock(&con->writequeue_lock);
+		log_print("writequeue empty for nodeid %d", con->nodeid);
+		return;
+	}
 
 
+	e = list_first_entry(&con->writequeue, struct writequeue_entry, list);
 	len = e->len;
 	len = e->len;
 	offset = e->offset;
 	offset = e->offset;
 	spin_unlock(&con->writequeue_lock);
 	spin_unlock(&con->writequeue_lock);