Commit 5efbf6f7 authored by Matthieu Baerts's avatar Matthieu Baerts Committed by Paolo Abeni
Browse files

mptcp: add mptcp_for_each_subflow_safe helper 



Similar to mptcp_for_each_subflow(): this is clearer now that the _safe
version is used in multiple places.

Reviewed-by: default avatarMat Martineau <mathew.j.martineau@linux.intel.com>
Signed-off-by: default avatarMatthieu Baerts <matthieu.baerts@tessares.net>
Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parent 006534ec

net/mptcp/pm_netlink.c

+1 −1
Original line number Diff line number Diff line
@@ -796,7 +796,7 @@ static void mptcp_pm_nl_rm_addr_or_subflow(struct mptcp_sock *msk, 
		u8 rm_id = rm_list->ids[i];

		bool removed = false;



		list_for_each_entry_safe(subflow, tmp, &msk->conn_list, node) {

		mptcp_for_each_subflow_safe(msk, subflow, tmp) {

			struct sock *ssk = mptcp_subflow_tcp_sock(subflow);

			int how = RCV_SHUTDOWN | SEND_SHUTDOWN;

			u8 id = subflow->local_id;

net/mptcp/protocol.c

+3 −3
Original line number Diff line number Diff line
@@ -2357,7 +2357,7 @@ static void __mptcp_close_subflow(struct mptcp_sock *msk) 


	might_sleep();



	list_for_each_entry_safe(subflow, tmp, &msk->conn_list, node) {

	mptcp_for_each_subflow_safe(msk, subflow, tmp) {

		struct sock *ssk = mptcp_subflow_tcp_sock(subflow);



		if (inet_sk_state_load(ssk) != TCP_CLOSE)
@@ -2400,7 +2400,7 @@ static void mptcp_check_fastclose(struct mptcp_sock *msk) 


	mptcp_token_destroy(msk);



	list_for_each_entry_safe(subflow, tmp, &msk->conn_list, node) {

	mptcp_for_each_subflow_safe(msk, subflow, tmp) {

		struct sock *tcp_sk = mptcp_subflow_tcp_sock(subflow);

		bool slow;
@@ -3047,7 +3047,7 @@ void mptcp_destroy_common(struct mptcp_sock *msk, unsigned int flags) 
	__mptcp_clear_xmit(sk);



	/* join list will be eventually flushed (with rst) at sock lock release time */

	list_for_each_entry_safe(subflow, tmp, &msk->conn_list, node)

	mptcp_for_each_subflow_safe(msk, subflow, tmp)

		__mptcp_close_ssk(sk, mptcp_subflow_tcp_sock(subflow), subflow, flags);



	/* move to sk_receive_queue, sk_stream_kill_queues will purge it */

net/mptcp/protocol.h

+2 −0
Original line number Diff line number Diff line
@@ -314,6 +314,8 @@ struct mptcp_sock { 


#define mptcp_for_each_subflow(__msk, __subflow)			\

	list_for_each_entry(__subflow, &((__msk)->conn_list), node)

#define mptcp_for_each_subflow_safe(__msk, __subflow, __tmp)			\

	list_for_each_entry_safe(__subflow, __tmp, &((__msk)->conn_list), node)



static inline void msk_owned_by_me(const struct mptcp_sock *msk)

{