Revert "net/rds: Change c_net field to possible_net_t"

This reverts commit f9eb108e49f31042519f9557f5c7863acbbfe04e.

Orabug: 35811116

Signed-off-by: Greg Jumper <[email protected]>
Reviewed-by: Sharath Srinivasan <[email protected]>

Author: Greg Jumper

net/rds/connection.c

@@ -758,6 +758,7 @@ void rds_conn_destroy(struct rds_connection *conn, int shutdown)
 
 	atomic_dec(&conn->c_trans->t_conn_count);
 
+	put_net(conn->c_net);
 	kfree(conn->c_path);
 	kmem_cache_free(rds_conn_slab, conn);
 }

net/rds/rds.h

@@ -369,7 +369,7 @@ struct rds_connection {
 	/* Protocol version */
 	unsigned int		c_proposed_version;
 	unsigned int		c_version;
-	possible_net_t		c_net;
+	struct net		*c_net;
 
 	/* Re-connect stall diagnostics */
 	unsigned long           c_reconnect_start;
@@ -404,14 +404,13 @@ struct rds_connection {
 static inline
 struct net *rds_conn_net(struct rds_connection *conn)
 {
-	return read_pnet(&conn->c_net);
+	return conn->c_net;
 }
 
 static inline
 void rds_conn_net_set(struct rds_connection *conn, struct net *net)
 {
-	/* Once set, never changed. */
-	write_pnet(&conn->c_net, net);
+	conn->c_net = get_net(net);
 }
 
 #define RDS_FLAG_CONG_BITMAP		0x01

net/rds/tcp.c

@@ -608,7 +608,9 @@ static void rds_tcp_kill_sock(struct net *net, struct rds_tcp_net *rtn)
 		sock_release(rtn->rds_tcp_accepted_sock);
 	spin_lock_irq(&rds_tcp_conn_lock);
 	list_for_each_entry_safe(tc, _tc, &rds_tcp_conn_list, t_tcp_node) {
-		if (!net_eq(net, rds_conn_net(tc->t_cpath->cp_conn)))
+		struct net *c_net = tc->t_cpath->cp_conn->c_net;
+
+		if (net != c_net)
 			continue;
 		if (!list_has_conn(&tmp_list, tc->t_cpath->cp_conn))
 			list_move_tail(&tc->t_tcp_node, &tmp_list);
@@ -663,8 +665,9 @@ 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) {
-		if (!net_eq(net, rds_conn_net(tc->t_cpath->cp_conn)) ||
-		    !tc->t_sock)
+		struct net *c_net = tc->t_cpath->cp_conn->c_net;
+
+		if (net != c_net || !tc->t_sock)
 			continue;
 
 		/* reconnect with new parameters */