diff options
| author | Paolo Abeni <pabeni@redhat.com> | 2020-11-16 10:48:04 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-05-30 12:57:46 +0100 |
| commit | f86568eca4c9808cc5e5aa3759ebba96c40b0131 (patch) | |
| tree | 11fe882b7c046ad3be61df35ec46ebea2f33bb32 /net | |
| parent | 34a5ee69ec6273f0aee79e7ce4d14afc83ca8122 (diff) | |
| download | linux-f86568eca4c9808cc5e5aa3759ebba96c40b0131.tar.gz linux-f86568eca4c9808cc5e5aa3759ebba96c40b0131.tar.bz2 linux-f86568eca4c9808cc5e5aa3759ebba96c40b0131.zip | |
tcp: factor out __tcp_close() helper
[ Upstream commit 77c3c95637526f1e4330cc9a4b2065f668c2c4fe ]
unlocked version of protocol level close, will be used by
MPTCP to allow decouple orphaning and subflow level close.
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Stable-dep-of: e14cadfd80d7 ("tcp: add annotations around sk->sk_shutdown accesses")
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'net')
| -rw-r--r-- | net/ipv4/tcp.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index 6a0560a735ce..3666fa307d0f 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c @@ -2510,13 +2510,12 @@ bool tcp_check_oom(struct sock *sk, int shift) return too_many_orphans || out_of_socket_memory; } -void tcp_close(struct sock *sk, long timeout) +void __tcp_close(struct sock *sk, long timeout) { struct sk_buff *skb; int data_was_unread = 0; int state; - lock_sock(sk); sk->sk_shutdown = SHUTDOWN_MASK; if (sk->sk_state == TCP_LISTEN) { @@ -2680,6 +2679,12 @@ adjudge_to_death: out: bh_unlock_sock(sk); local_bh_enable(); +} + +void tcp_close(struct sock *sk, long timeout) +{ + lock_sock(sk); + __tcp_close(sk, timeout); release_sock(sk); sock_put(sk); } |