[PATCH] sunrpc: cache_register can use wrong module reference

[linux-2.6] / net / ipv4 / inet_hashtables.c

diff --git a/net/ipv4/inet_hashtables.c b/net/ipv4/inet_hashtables.c
index 88fcba05b7d646fb6b6d00e7b934063e4a79352e..e8d29fe736d29ade84886500ec61bab103a54ceb 100644 (file)
--- a/net/ipv4/inet_hashtables.c
+++ b/net/ipv4/inet_hashtables.c
@@ -19,6 +19,7 @@
 #include <linux/slab.h>
 #include <linux/wait.h>
 
+#include <net/inet_connection_sock.h>
 #include <net/inet_hashtables.h>
 
 /*
@@ -56,10 +57,9 @@ void inet_bind_bucket_destroy(kmem_cache_t *cachep, struct inet_bind_bucket *tb)
 void inet_bind_hash(struct sock *sk, struct inet_bind_bucket *tb,
                    const unsigned short snum)
 {
-       struct inet_sock *inet = inet_sk(sk);
-       inet->num       = snum;
+       inet_sk(sk)->num = snum;
        sk_add_bind_node(sk, &tb->owners);
-       inet->bind_hash = tb;
+       inet_csk(sk)->icsk_bind_hash = tb;
 }
 
 EXPORT_SYMBOL(inet_bind_hash);
@@ -69,16 +69,15 @@ EXPORT_SYMBOL(inet_bind_hash);
  */
 static void __inet_put_port(struct inet_hashinfo *hashinfo, struct sock *sk)
 {
-       struct inet_sock *inet = inet_sk(sk);
-       const int bhash = inet_bhashfn(inet->num, hashinfo->bhash_size);
+       const int bhash = inet_bhashfn(inet_sk(sk)->num, hashinfo->bhash_size);
        struct inet_bind_hashbucket *head = &hashinfo->bhash[bhash];
        struct inet_bind_bucket *tb;
 
        spin_lock(&head->lock);
-       tb = inet->bind_hash;
+       tb = inet_csk(sk)->icsk_bind_hash;
        __sk_del_bind_node(sk);
-       inet->bind_hash = NULL;
-       inet->num = 0;
+       inet_csk(sk)->icsk_bind_hash = NULL;
+       inet_sk(sk)->num = 0;
        inet_bind_bucket_destroy(hashinfo->bind_bucket_cachep, tb);
        spin_unlock(&head->lock);
 }
@@ -162,3 +161,5 @@ struct sock *__inet_lookup_listener(const struct hlist_head *head, const u32 dad
        }
        return result;
 }
+
+EXPORT_SYMBOL_GPL(__inet_lookup_listener);