rhashtable: Revert nested table changes.

[mirror_ubuntu-zesty-kernel.git] / net / tipc / socket.c

diff --git a/net/tipc/socket.c b/net/tipc/socket.c
index 370a5912bcb533fdd0d344492e169a38568c525c..800caaa699a1669f6efe228e51974e6e2bd19e60 100644 (file)
--- a/net/tipc/socket.c
+++ b/net/tipc/socket.c
@@ -384,6 +384,8 @@ static int tipc_sk_create(struct net *net, struct socket *sock,
        INIT_LIST_HEAD(&tsk->publications);
        msg = &tsk->phdr;
        tn = net_generic(sock_net(sk), tipc_net_id);
+       tipc_msg_init(tn->own_addr, msg, TIPC_LOW_IMPORTANCE, TIPC_NAMED_MSG,
+                     NAMED_H_SIZE, 0);
 
        /* Finish initializing socket data structures */
        sock->ops = ops;
@@ -393,13 +395,6 @@ static int tipc_sk_create(struct net *net, struct socket *sock,
                pr_warn("Socket create failed; port number exhausted\n");
                return -EINVAL;
        }
-
-       /* Ensure tsk is visible before we read own_addr. */
-       smp_mb();
-
-       tipc_msg_init(tn->own_addr, msg, TIPC_LOW_IMPORTANCE, TIPC_NAMED_MSG,
-                     NAMED_H_SIZE, 0);
-
        msg_set_origport(msg, tsk->portid);
        setup_timer(&sk->sk_timer, tipc_sk_timeout, (unsigned long)tsk);
        sk->sk_shutdown = 0;
@@ -2274,27 +2269,24 @@ static int tipc_sk_withdraw(struct tipc_sock *tsk, uint scope,
 void tipc_sk_reinit(struct net *net)
 {
        struct tipc_net *tn = net_generic(net, tipc_net_id);
-       struct rhashtable_iter iter;
+       const struct bucket_table *tbl;
+       struct rhash_head *pos;
        struct tipc_sock *tsk;
        struct tipc_msg *msg;
+       int i;
 
-       rhashtable_walk_enter(&tn->sk_rht, &iter);
-
-       do {
-               tsk = ERR_PTR(rhashtable_walk_start(&iter));
-               if (tsk)
-                       continue;
-
-               while ((tsk = rhashtable_walk_next(&iter)) && !IS_ERR(tsk)) {
+       rcu_read_lock();
+       tbl = rht_dereference_rcu((&tn->sk_rht)->tbl, &tn->sk_rht);
+       for (i = 0; i < tbl->size; i++) {
+               rht_for_each_entry_rcu(tsk, pos, tbl, i, node) {
                        spin_lock_bh(&tsk->sk.sk_lock.slock);
                        msg = &tsk->phdr;
                        msg_set_prevnode(msg, tn->own_addr);
                        msg_set_orignode(msg, tn->own_addr);
                        spin_unlock_bh(&tsk->sk.sk_lock.slock);
                }
-
-               rhashtable_walk_stop(&iter);
-       } while (tsk == ERR_PTR(-EAGAIN));
+       }
+       rcu_read_unlock();
 }
 
 static struct tipc_sock *tipc_sk_lookup(struct net *net, u32 portid)