tcp: Unlink sk from bhash.

Now we do not use tb->owners and can unlink sockets from bhash.

sk_bind_node/tw_bind_node are available for bhash2 and will be
used in the following patch.

Signed-off-by: Kuniyuki Iwashima <kuniyu@amazon.com>
Reviewed-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/include/net/inet_hashtables.h b/include/net/inet_hashtables.h
index 25ba471ba1616d9e77dec7d515c4e977855042ce..98ba728aec0854229a2e2b1b219f2f660b710583 100644 (file)
--- a/include/net/inet_hashtables.h
+++ b/include/net/inet_hashtables.h
@@ -88,7 +88,6 @@ struct inet_bind_bucket {
        unsigned short          fast_sk_family;
        bool                    fast_ipv6_only;
        struct hlist_node       node;
-       struct hlist_head       owners;
        struct hlist_head       bhash2;
 };
 

diff --git a/net/ipv4/inet_hashtables.c b/net/ipv4/inet_hashtables.c
index 355cc6c0eaabb40af1a8680557a12baa6d636429..5c3ad37624f1b2820f76161fd5f21472bca5d7f9 100644 (file)
--- a/net/ipv4/inet_hashtables.c
+++ b/net/ipv4/inet_hashtables.c
@@ -76,7 +76,6 @@ struct inet_bind_bucket *inet_bind_bucket_create(struct kmem_cache *cachep,
                tb->port      = snum;
                tb->fastreuse = 0;
                tb->fastreuseport = 0;
-               INIT_HLIST_HEAD(&tb->owners);
                INIT_HLIST_HEAD(&tb->bhash2);
                hlist_add_head(&tb->node, &head->chain);
        }
@@ -169,7 +168,6 @@ void inet_bind_hash(struct sock *sk, struct inet_bind_bucket *tb,
                    struct inet_bind2_bucket *tb2, unsigned short port)
 {
        inet_sk(sk)->inet_num = port;
-       sk_add_bind_node(sk, &tb->owners);
        inet_csk(sk)->icsk_bind_hash = tb;
        sk_add_bind2_node(sk, &tb2->owners);
        inet_csk(sk)->icsk_bind2_hash = tb2;
@@ -192,7 +190,6 @@ static void __inet_put_port(struct sock *sk)
 
        spin_lock(&head->lock);
        tb = inet_csk(sk)->icsk_bind_hash;
-       __sk_del_bind_node(sk);
        inet_csk(sk)->icsk_bind_hash = NULL;
        inet_sk(sk)->inet_num = 0;
 

diff --git a/net/ipv4/inet_timewait_sock.c b/net/ipv4/inet_timewait_sock.c
index 466d4faa9272d15b49b5c5210f7de64b18679ddf..547583a87bd3a65f48de3fc035a143653275d2ff 100644 (file)
--- a/net/ipv4/inet_timewait_sock.c
+++ b/net/ipv4/inet_timewait_sock.c
@@ -35,7 +35,6 @@ void inet_twsk_bind_unhash(struct inet_timewait_sock *tw,
        if (!tb)
                return;
 
-       __hlist_del(&tw->tw_bind_node);
        tw->tw_tb = NULL;
 
        __hlist_del(&tw->tw_bind2_node);
@@ -94,12 +93,6 @@ static void inet_twsk_add_node_rcu(struct inet_timewait_sock *tw,
        hlist_nulls_add_head_rcu(&tw->tw_node, list);
 }
 
-static void inet_twsk_add_bind_node(struct inet_timewait_sock *tw,
-                                   struct hlist_head *list)
-{
-       hlist_add_head(&tw->tw_bind_node, list);
-}
-
 static void inet_twsk_add_bind2_node(struct inet_timewait_sock *tw,
                                     struct hlist_head *list)
 {
@@ -133,7 +126,6 @@ void inet_twsk_hashdance(struct inet_timewait_sock *tw, struct sock *sk,
 
        tw->tw_tb = icsk->icsk_bind_hash;
        WARN_ON(!icsk->icsk_bind_hash);
-       inet_twsk_add_bind_node(tw, &tw->tw_tb->owners);
 
        tw->tw_tb2 = icsk->icsk_bind2_hash;
        WARN_ON(!icsk->icsk_bind2_hash);