diff options
| author | Kuniyuki Iwashima <kuniyu@amazon.co.jp> | 2021-12-08 07:21:58 +0100 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2021-12-11 04:43:00 +0100 |
| commit | 33d60fbd21fa6f71a88571209e301ec6de59f81b (patch) | |
| tree | 3e163274b8b1a636ab4b5aaf05fd0370ea806ff5 /net/llc | |
| parent | Merge https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next (diff) | |
| download | linux-33d60fbd21fa6f71a88571209e301ec6de59f81b.tar.xz linux-33d60fbd21fa6f71a88571209e301ec6de59f81b.zip | |
sock: Use sock_owned_by_user_nocheck() instead of sk_lock.owned.
This patch moves sock_release_ownership() down in include/net/sock.h and
replaces some sk_lock.owned tests with sock_owned_by_user_nocheck().
Signed-off-by: Kuniyuki Iwashima <kuniyu@amazon.co.jp>
Link: https://lore.kernel.org/r/20211208062158.54132-1-kuniyu@amazon.co.jp
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'net/llc')
| -rw-r--r-- | net/llc/llc_proc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/llc/llc_proc.c b/net/llc/llc_proc.c index 0ff490a73fae..07e9abb5978a 100644 --- a/net/llc/llc_proc.c +++ b/net/llc/llc_proc.c @@ -195,7 +195,7 @@ static int llc_seq_core_show(struct seq_file *seq, void *v) timer_pending(&llc->pf_cycle_timer.timer), timer_pending(&llc->rej_sent_timer.timer), timer_pending(&llc->busy_state_timer.timer), - !!sk->sk_backlog.tail, !!sk->sk_lock.owned); + !!sk->sk_backlog.tail, sock_owned_by_user_nocheck(sk)); out: return 0; } |