| Message ID | 84985e126b6099383fd86edcc0b0f47ceba5df98.1605822960.git.pabeni@redhat.com |
|---|---|
| State | Accepted, archived |
| Commit | b9f9f29ffc8b8b01f1b4dd67e03d9ed64751b44e |
| Delegated to: | Matthieu Baerts |
| Headers | show |
| Series | [net-next] Squash-to: "mptcp: open code mptcp variant for lock_sock" | expand |
Hi Paolo,
On 19/11/2020 22:56, Paolo Abeni wrote:
> deal with report from kernel test robot
Thanks for this fix!
- b9f9f29ffc8b: "squashed" in "mptcp: open code mptcp variant for lock_sock"
- Results: 11818af71ea2..3e5b456bf2e8
Tests + export are in progress!
Cheers,
Matt
diff --git a/include/net/sock.h b/include/net/sock.h index 1d29aeae74fd..86d074979ca0 100644 --- a/include/net/sock.h +++ b/include/net/sock.h @@ -1585,6 +1585,7 @@ static inline void lock_sock(struct sock *sk) lock_sock_nested(sk, 0); } +void __lock_sock(struct sock *sk); void __release_sock(struct sock *sk); void release_sock(struct sock *sk); diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h index 93aa60231632..1b50249138d2 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -255,8 +255,6 @@ struct mptcp_sock { } rcvq_space; }; -void __lock_sock(struct sock *sk); - #define mptcp_lock_sock(___sk, cb) do { \ struct sock *__sk = (___sk); /* silence macro reuse warning */ \ might_sleep(); \
deal with report from kernel test robot Signed-off-by: Paolo Abeni <pabeni@redhat.com> --- include/net/sock.h | 1 + net/mptcp/protocol.h | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-)