Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm...

[~andy/linux] / fs / dlm / lowcomms.c

diff --git a/fs/dlm/lowcomms.c b/fs/dlm/lowcomms.c
index a5e34dd6a32c91ac8bd7f85834e4f241a929bec8..3190ca973dd6be657a50b3cd8ff0f34b06a40fb1 100644 (file)
--- a/fs/dlm/lowcomms.c
+++ b/fs/dlm/lowcomms.c
@@ -714,11 +714,11 @@ static void process_sctp_notification(struct connection *con,
                                return;
 
                        /* Peel off a new sock */
-                       sctp_lock_sock(con->sock->sk);
+                       lock_sock(con->sock->sk);
                        ret = sctp_do_peeloff(con->sock->sk,
                                sn->sn_assoc_change.sac_assoc_id,
                                &new_con->sock);
-                       sctp_release_sock(con->sock->sk);
+                       release_sock(con->sock->sk);
                        if (ret < 0) {
                                log_print("Can't peel off a socket for "
                                          "connection %d to node %d: err=%d",