3 files changed, 7 insertions, 6 deletions

diff --git a/net/rds/connection.c b/net/rds/connection.c
index 7ee2d5d68b78..9efc82c665b5 100644
--- a/net/rds/connection.c
+++ b/net/rds/connection.c
@@ -366,6 +366,8 @@ void rds_conn_shutdown(struct rds_conn_path *cp)
          * to the conn hash, so we never trigger a reconnect on this
          * conn - the reconnect is always triggered by the active peer. */
         cancel_delayed_work_sync(&cp->cp_conn_w);
+        if (conn->c_destroy_in_prog)
+                return;
         rcu_read_lock();
         if (!hlist_unhashed(&conn->c_hash_node)) {
                 rcu_read_unlock();
@@ -445,7 +447,6 @@ void rds_conn_destroy(struct rds_connection *conn)
          */
         rds_cong_remove_conn(conn);
 
-        put_net(conn->c_net);
         kfree(conn->c_path);
         kmem_cache_free(rds_conn_slab, conn);
 
diff --git a/net/rds/rds.h b/net/rds/rds.h
index c349c71babff..d09f6c1facb4 100644
--- a/net/rds/rds.h
+++ b/net/rds/rds.h
@@ -150,7 +150,7 @@ struct rds_connection {
 
         /* Protocol version */
         unsigned int            c_version;
-        struct net              *c_net;
+        possible_net_t          c_net;
 
         struct list_head        c_map_item;
         unsigned long           c_map_queued;
@@ -165,13 +165,13 @@ struct rds_connection {
 static inline
 struct net *rds_conn_net(struct rds_connection *conn)
 {
-        return conn->c_net;
+        return read_pnet(&conn->c_net);
 }
 
 static inline
 void rds_conn_net_set(struct rds_connection *conn, struct net *net)
 {
-        conn->c_net = get_net(net);
+        write_pnet(&conn->c_net, net);
 }
 
 #define RDS_FLAG_CONG_BITMAP    0x01
diff --git a/net/rds/tcp.c b/net/rds/tcp.c
index 222cc530e5b5..f580f72ae69e 100644
--- a/net/rds/tcp.c
+++ b/net/rds/tcp.c
@@ -506,7 +506,7 @@ static void rds_tcp_kill_sock(struct net *net)
         rds_tcp_listen_stop(lsock, &rtn->rds_tcp_accept_w);
         spin_lock_irq(&rds_tcp_conn_lock);
         list_for_each_entry_safe(tc, _tc, &rds_tcp_conn_list, t_tcp_node) {
-                struct net *c_net = tc->t_cpath->cp_conn->c_net;
+                struct net *c_net = read_pnet(&tc->t_cpath->cp_conn->c_net);
 
                 if (net != c_net || !tc->t_sock)
                         continue;
@@ -563,7 +563,7 @@ static void rds_tcp_sysctl_reset(struct net *net)
 
         spin_lock_irq(&rds_tcp_conn_lock);
         list_for_each_entry_safe(tc, _tc, &rds_tcp_conn_list, t_tcp_node) {
-                struct net *c_net = tc->t_cpath->cp_conn->c_net;
+                struct net *c_net = read_pnet(&tc->t_cpath->cp_conn->c_net);
 
                 if (net != c_net || !tc->t_sock)
                         continue;