mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-27 19:29:37 +00:00
dlm: fix lowcomms_connect_node for sctp
The recently added dlm_lowcomms_connect_node() from
391fbdc5d5
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>
This commit is contained in:
parent
9c1fe834c1
commit
04bedd79a7
1 changed files with 10 additions and 3 deletions
|
@ -316,6 +316,10 @@ int dlm_lowcomms_connect_node(int nodeid)
|
|||
{
|
||||
struct connection *con;
|
||||
|
||||
/* with sctp there's no connecting without sending */
|
||||
if (dlm_config.ci_protocol != 0)
|
||||
return 0;
|
||||
|
||||
if (nodeid == dlm_our_nodeid())
|
||||
return 0;
|
||||
|
||||
|
@ -855,11 +859,14 @@ static void sctp_init_assoc(struct connection *con)
|
|||
outmessage.msg_flags = MSG_EOR;
|
||||
|
||||
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;
|
||||
offset = e->offset;
|
||||
spin_unlock(&con->writequeue_lock);
|
||||
|
|
Loading…
Reference in a new issue