Commit 765ff425 authored by Paolo Abeni's avatar Paolo Abeni Committed by David S. Miller
Browse files

mptcp: use lockdep_assert_held_once() instead of open-coding it 



We have a few more places where the mptcp code duplicates
lockdep_assert_held_once(). Let's use the existing macro and
avoid a bunch of compiler's conditional.

Reviewed-by: default avatarMatthieu Baerts <matthieu.baerts@tessares.net>
Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
Signed-off-by: default avatarMat Martineau <mathew.j.martineau@linux.intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 13ac17a3

net/mptcp/protocol.c

+3 −6
Original line number Diff line number Diff line
@@ -956,9 +956,7 @@ static void __mptcp_update_wmem(struct sock *sk) 
{

	struct mptcp_sock *msk = mptcp_sk(sk);



#ifdef CONFIG_LOCKDEP

	WARN_ON_ONCE(!lockdep_is_held(&sk->sk_lock.slock));

#endif

	lockdep_assert_held_once(&sk->sk_lock.slock);



	if (!msk->wmem_reserved)

		return;
@@ -1117,9 +1115,8 @@ static void __mptcp_clean_una(struct sock *sk) 


static void __mptcp_clean_una_wakeup(struct sock *sk)

{

#ifdef CONFIG_LOCKDEP

	WARN_ON_ONCE(!lockdep_is_held(&sk->sk_lock.slock));

#endif

	lockdep_assert_held_once(&sk->sk_lock.slock);



	__mptcp_clean_una(sk);

	mptcp_write_space(sk);

}