diff --git a/[refs] b/[refs] index 181c23b356c7..12c1e7ffd60d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b3657629249eba0b3b61ff964d6e1539b469d117 +refs/heads/master: f4fadb23ca49abd2f1387a0b7e78b385ebc760ce diff --git a/trunk/fs/dlm/lowcomms.c b/trunk/fs/dlm/lowcomms.c index 73d44f57e24a..0553a6158dcb 100644 --- a/trunk/fs/dlm/lowcomms.c +++ b/trunk/fs/dlm/lowcomms.c @@ -728,7 +728,7 @@ static int tcp_accept_from_sock(struct connection *con) else { printk("Extra connection from node %d attempted\n", nodeid); result = -EAGAIN; - up_write(&newcon->sock_sem); + mutex_unlock(&newcon->sock_mutex); goto accept_err; } }