summaryrefslogtreecommitdiff
path: root/net/rds/tcp.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2025-03-19 08:58:07 +0100
committerTakashi Iwai <tiwai@suse.de>2025-03-19 08:58:07 +0100
commit1a7c3068143be177deea86d977d3042a0c256706 (patch)
tree82eef5ceb0f3cc15a6cdf617ca4511db3af73e21 /net/rds/tcp.c
parentc2820405ba55a38932aa2177f026b70064296663 (diff)
parent35ef1c79d2e09e9e5a66e28a66fe0df4368b0f3d (diff)
Merge branch 'for-linus' into for-next
Back-merge of 6.14 devel branch for further developments of TAS codecsBack-merge of 6.14 devel branch for further developments. Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'net/rds/tcp.c')
-rw-r--r--net/rds/tcp.c8
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) {