Commit 5409fd6f authored by Geliang Tang's avatar Geliang Tang Committed by Jakub Kicinski
Browse files

mptcp: drop useless "err = 0" in subflow_destroy 



Upon successful return, mptcp_pm_parse_addr() returns 0. There is no need
to set "err = 0" after this. So after mptcp_nl_find_ssk() returns, just
need to set "err = -ESRCH", then release and free msk socket if it returns
NULL.

Also, no need to define the variable "subflow" in subflow_destroy(), use
mptcp_subflow_ctx(ssk) directly.

This patch doesn't change the behaviour of the code, just refactoring.

Signed-off-by: default avatarGeliang Tang <tanggeliang@kylinos.cn>
Reviewed-by: default avatarMatthieu Baerts (NGI0) <matttbe@kernel.org>
Signed-off-by: default avatarMatthieu Baerts (NGI0) <matttbe@kernel.org>
Link: https://patch.msgid.link/20241213-net-next-mptcp-pm-misc-cleanup-v1-7-ddb6d00109a8@kernel.org


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 1c670b39

net/mptcp/pm_userspace.c

+10 −11
Original line number Diff line number Diff line
@@ -538,19 +538,18 @@ int mptcp_pm_nl_subflow_destroy_doit(struct sk_buff *skb, struct genl_info *info 


	lock_sock(sk);

	ssk = mptcp_nl_find_ssk(msk, &addr_l.addr, &addr_r);

	if (ssk) {

		struct mptcp_subflow_context *subflow = mptcp_subflow_ctx(ssk);

	if (!ssk) {

		err = -ESRCH;

		goto release_sock;

	}



	spin_lock_bh(&msk->pm.lock);

	mptcp_userspace_pm_delete_local_addr(msk, &addr_l);

	spin_unlock_bh(&msk->pm.lock);

	mptcp_subflow_shutdown(sk, ssk, RCV_SHUTDOWN | SEND_SHUTDOWN);

		mptcp_close_ssk(sk, ssk, subflow);

	mptcp_close_ssk(sk, ssk, mptcp_subflow_ctx(ssk));

	MPTCP_INC_STATS(sock_net(sk), MPTCP_MIB_RMSUBFLOW);

		err = 0;

	} else {

		err = -ESRCH;

	}

release_sock:

	release_sock(sk);



destroy_err: