diff options
| author | Ingo Molnar <mingo@kernel.org> | 2025-03-08 00:54:06 +0100 | 
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2025-03-08 00:54:06 +0100 | 
| commit | f23ecef20af6fbd489e0362d33cdf8d9429fa901 (patch) | |
| tree | 713f06d8335b7c3388bbfbc46cb6d2a568951252 /net/rds/tcp.c | |
| parent | c929d08df8bee855528b9d15b853c892c54e1eee (diff) | |
| parent | 85b2b9c16d053364e2004883140538e73b333cdb (diff) | |
Merge branch 'locking/urgent' into locking/core, to pick up locking fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'net/rds/tcp.c')
| -rw-r--r-- | net/rds/tcp.c | 8 | 
1 files changed, 2 insertions, 6 deletions
diff --git a/net/rds/tcp.c b/net/rds/tcp.c index 0581c53e6517..3cc2f303bf78 100644 --- a/net/rds/tcp.c +++ b/net/rds/tcp.c @@ -504,12 +504,8 @@ bool rds_tcp_tune(struct socket *sock)  			release_sock(sk);  			return false;  		} -		/* Update ns_tracker to current stack trace and refcounted tracker */ -		__netns_tracker_free(net, &sk->ns_tracker, false); - -		sk->sk_net_refcnt = 1; -		netns_tracker_alloc(net, &sk->ns_tracker, GFP_KERNEL); -		sock_inuse_add(net, 1); +		sk_net_refcnt_upgrade(sk); +		put_net(net);  	}  	rtn = net_generic(net, rds_tcp_netid);  	if (rtn->sndbuf_size > 0) {  | 
