diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2024-05-08 19:21:51 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2024-05-08 19:21:51 +0100 |
| commit | ed63ba15d7830c30077dbb33c94242be01e45a18 (patch) | |
| tree | 8165313975d57f025e640d33768dbc31493ce5b7 /net/unix/garbage.c | |
| parent | 5015f8a5ced7039de354c1103b0912f5a64fab03 (diff) | |
| parent | dd5a440a31fae6e459c0d6271dddd62825505361 (diff) | |
Merge 6.9-rc7 into char-misc-testing
We need the char-misc changes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net/unix/garbage.c')
| -rw-r--r-- | net/unix/garbage.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/unix/garbage.c b/net/unix/garbage.c index 6433a414acf8..0104be9d4704 100644 --- a/net/unix/garbage.c +++ b/net/unix/garbage.c @@ -299,7 +299,7 @@ static void __unix_gc(struct work_struct *work) __set_bit(UNIX_GC_MAYBE_CYCLE, &u->gc_flags); if (sk->sk_state == TCP_LISTEN) { - unix_state_lock(sk); + unix_state_lock_nested(sk, U_LOCK_GC_LISTENER); unix_state_unlock(sk); } } |