Re: [PATCH v2 net 2/4] dccp/tcp: Remove NULL check for prev_saddr in inet_bhash2_update_saddr().
Joanne Koong <[email protected]>
| Newsgroups | org.kernel.vger.dccp,org.kernel.vger.netdev |
|---|---|
| Message-ID | <CAJnrk1b-hHSp6n89uC+0dDZKm+bmVm1fRVmwP2oYqKSea9phKQ@mail.gmail.com> |
On Wed, Nov 16, 2022 at 2:29 PM Kuniyuki Iwashima <[email protected]> wrote: > > When we call inet_bhash2_update_saddr(), prev_saddr is always non-NULL. > Let's remove the unnecessary test. > > Signed-off-by: Kuniyuki Iwashima <[email protected]> Acked-by: Joanne Koong <[email protected]> > --- > net/ipv4/inet_hashtables.c | 11 ++++------- > 1 file changed, 4 insertions(+), 7 deletions(-) > > diff --git a/net/ipv4/inet_hashtables.c b/net/ipv4/inet_hashtables.c > index 033bf3c2538f..d745f962745e 100644 > --- a/net/ipv4/inet_hashtables.c > +++ b/net/ipv4/inet_hashtables.c > @@ -877,13 +877,10 @@ int inet_bhash2_update_saddr(struct inet_bind_hashbucket *prev_saddr, struct soc > > head2 = inet_bhashfn_portaddr(hinfo, sk, net, port); > > - if (prev_saddr) { > - spin_lock_bh(&prev_saddr->lock); > - __sk_del_bind2_node(sk); > - inet_bind2_bucket_destroy(hinfo->bind2_bucket_cachep, > - inet_csk(sk)->icsk_bind2_hash); > - spin_unlock_bh(&prev_saddr->lock); > - } > + spin_lock_bh(&prev_saddr->lock); > + __sk_del_bind2_node(sk); > + inet_bind2_bucket_destroy(hinfo->bind2_bucket_cachep, inet_csk(sk)->icsk_bind2_hash); > + spin_unlock_bh(&prev_saddr->lock); > > spin_lock_bh(&head2->lock); > tb2 = inet_bind2_bucket_find(head2, net, port, l3mdev, sk); > -- > 2.30.2 >