diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2024-02-20 22:57:35 -0800 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2024-02-20 22:57:35 -0800 |
| commit | 40de53fd002c6ba087a623722915e8006ed68a02 (patch) | |
| tree | ec733b0a05924f98855728cd24de2ea38e1223b8 /net/unix/af_unix.c | |
| parent | 0cab687205986491302cd2e440ef1d253031c221 (diff) | |
| parent | f3e6b3ae9cfc128af11b665c6ef4022ba2683778 (diff) | |
Merge branch 'for-6.8/cxl-cper' into for-6.8/cxl
Pick up CXL CPER notification removal for v6.8-rc6, to return in a later
merge window.
Diffstat (limited to 'net/unix/af_unix.c')
| -rw-r--r-- | net/unix/af_unix.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c index ac1f2bc18fc9..30b178ebba60 100644 --- a/net/unix/af_unix.c +++ b/net/unix/af_unix.c @@ -1344,13 +1344,11 @@ static void unix_state_double_lock(struct sock *sk1, struct sock *sk2) unix_state_lock(sk1); return; } - if (sk1 < sk2) { - unix_state_lock(sk1); - unix_state_lock_nested(sk2); - } else { - unix_state_lock(sk2); - unix_state_lock_nested(sk1); - } + if (sk1 > sk2) + swap(sk1, sk2); + + unix_state_lock(sk1); + unix_state_lock_nested(sk2, U_LOCK_SECOND); } static void unix_state_double_unlock(struct sock *sk1, struct sock *sk2) @@ -1591,7 +1589,7 @@ restart: goto out_unlock; } - unix_state_lock_nested(sk); + unix_state_lock_nested(sk, U_LOCK_SECOND); if (sk->sk_state != st) { unix_state_unlock(sk); |