]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commitdiff
inet_diag: Remove _bh suffix in inet_diag_dump_reqs().
authorHiroaki SHIMODA <shimoda.hiroaki@gmail.com>
Thu, 18 Jun 2015 11:40:54 +0000 (20:40 +0900)
committerDavid S. Miller <davem@davemloft.net>
Tue, 23 Jun 2015 08:19:52 +0000 (01:19 -0700)
inet_diag_dump_reqs() is called from inet_diag_dump_icsk() with BH
disabled. So no need to disable BH in inet_diag_dump_reqs().

Signed-off-by: Hiroaki Shimoda <shimoda.hiroaki@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/ipv4/inet_diag.c

index ba6a80f90e7deffc536e57a6424f0605670f54be..516a1f6fbdd38d191ea621f1a5bac6bf246c7b62 100644 (file)
@@ -746,7 +746,7 @@ static int inet_diag_dump_reqs(struct sk_buff *skb, struct sock *sk,
 
        entry.family = sk->sk_family;
 
-       spin_lock_bh(&icsk->icsk_accept_queue.syn_wait_lock);
+       spin_lock(&icsk->icsk_accept_queue.syn_wait_lock);
 
        lopt = icsk->icsk_accept_queue.listen_opt;
        if (!lopt || !listen_sock_qlen(lopt))
@@ -794,7 +794,7 @@ static int inet_diag_dump_reqs(struct sk_buff *skb, struct sock *sk,
        }
 
 out:
-       spin_unlock_bh(&icsk->icsk_accept_queue.syn_wait_lock);
+       spin_unlock(&icsk->icsk_accept_queue.syn_wait_lock);
 
        return err;
 }