sctp: consolidate local_bh_disable/enable + spin_lock/unlock to _bh variant

local_bh_disable() + spin_lock() is equivalent to spin_lock_bh(), same for
the unlock/enable case, so replace the calls by the appropriate wrappers.

Signed-off-by: Nicholas Mc Guire <hofrat@osadl.org>
Acked-by: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/sctp/socket.c b/net/sctp/socket.c
index b89501e5c1a1ecef29f4ca6cceb2ecd064f595bb..f28ecf88cfeac261301521ed002fbce7fbb9fb5c 100644 (file)
--- a/net/sctp/socket.c
+++ b/net/sctp/socket.c
@@ -7254,14 +7254,12 @@ static void sctp_sock_migrate(struct sock *oldsk, struct sock *newsk,
        /* Hook this new socket in to the bind_hash list. */
        head = &sctp_port_hashtable[sctp_phashfn(sock_net(oldsk),
                                                 inet_sk(oldsk)->inet_num)];
-       local_bh_disable();
-       spin_lock(&head->lock);
+       spin_lock_bh(&head->lock);
        pp = sctp_sk(oldsk)->bind_hash;
        sk_add_bind_node(newsk, &pp->owner);
        sctp_sk(newsk)->bind_hash = pp;
        inet_sk(newsk)->inet_num = inet_sk(oldsk)->inet_num;
-       spin_unlock(&head->lock);
-       local_bh_enable();
+       spin_unlock_bh(&head->lock);
 
        /* Copy the bind_addr list from the original endpoint to the new
         * endpoint so that we can handle restarts properly