| Message ID | 1434627654-3630-1-git-send-email-shimoda.hiroaki@gmail.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
On Thu, 2015-06-18 at 20:40 +0900, Hiroaki Shimoda wrote: > 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> > --- > net/ipv4/inet_diag.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/net/ipv4/inet_diag.c b/net/ipv4/inet_diag.c > index 21985d8d41e7..4ca789ba63cb 100644 > --- a/net/ipv4/inet_diag.c > +++ b/net/ipv4/inet_diag.c > @@ -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; > } Sure, although this will soon be removed completely when SYN_RECV sockets will be stored in regular ehash table. Thanks -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Thu, 18 Jun 2015 23:42:08 -0700 Eric Dumazet <eric.dumazet@gmail.com> wrote: > Sure, although this will soon be removed completely when SYN_RECV > sockets will be stored in regular ehash table. OK. Thank you for letting me know. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
From: Hiroaki Shimoda <shimoda.hiroaki@gmail.com> Date: Thu, 18 Jun 2015 20:40:54 +0900 > 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> Applied. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/net/ipv4/inet_diag.c b/net/ipv4/inet_diag.c index 21985d8d41e7..4ca789ba63cb 100644 --- a/net/ipv4/inet_diag.c +++ b/net/ipv4/inet_diag.c @@ -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; }
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> --- net/ipv4/inet_diag.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)