Commit 2f8a397d authored by Paolo Abeni's avatar Paolo Abeni Committed by David S. Miller
Browse files

inet_connection_sock: factor out destroy helper. 



Move the steps to prepare an inet_connection_sock for
forced disposal inside a separate helper. No functional
changes inteded, this will just simplify the next patch.

Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
Reviewed-by: default avatarChristoph Paasch <cpaasch@apple.com>
Reviewed-by: default avatarMat Martineau <mathew.j.martineau@linux.intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 90bf4513

include/net/inet_connection_sock.h

+8 −0
Original line number Diff line number Diff line
@@ -287,6 +287,14 @@ static inline int inet_csk_reqsk_queue_is_full(const struct sock *sk) 
void inet_csk_reqsk_queue_drop(struct sock *sk, struct request_sock *req);

void inet_csk_reqsk_queue_drop_and_put(struct sock *sk, struct request_sock *req);



static inline void inet_csk_prepare_for_destroy_sock(struct sock *sk)

{

	/* The below has to be done to allow calling inet_csk_destroy_sock */

	sock_set_flag(sk, SOCK_DEAD);

	percpu_counter_inc(sk->sk_prot->orphan_count);

	inet_sk(sk)->inet_num = 0;

}



void inet_csk_destroy_sock(struct sock *sk);

void inet_csk_prepare_forced_close(struct sock *sk);

net/ipv4/inet_connection_sock.c

+1 −5
Original line number Diff line number Diff line
@@ -896,11 +896,7 @@ void inet_csk_prepare_forced_close(struct sock *sk) 
	/* sk_clone_lock locked the socket and set refcnt to 2 */

	bh_unlock_sock(sk);

	sock_put(sk);



	/* The below has to be done to allow calling inet_csk_destroy_sock */

	sock_set_flag(sk, SOCK_DEAD);

	percpu_counter_inc(sk->sk_prot->orphan_count);

	inet_sk(sk)->inet_num = 0;

	inet_csk_prepare_for_destroy_sock(sk);

}

EXPORT_SYMBOL(inet_csk_prepare_forced_close);

CRA Git | Maintained and supported by SUSTech CRA and CCSE