mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-11-11 12:28:41 +08:00
rxrpc: Don't use sk->sk_receive_queue.lock to guard socket state changes
Don't use sk->sk_receive_queue.lock to guard socket state changes as the socket mutex is sufficient. Signed-off-by: David Howells <dhowells@redhat.com> cc: Marc Dionne <marc.dionne@auristor.com> cc: linux-afs@lists.infradead.org
This commit is contained in:
parent
4041a8ff65
commit
81f2e8adc0
@ -812,14 +812,12 @@ static int rxrpc_shutdown(struct socket *sock, int flags)
|
||||
|
||||
lock_sock(sk);
|
||||
|
||||
spin_lock_bh(&sk->sk_receive_queue.lock);
|
||||
if (sk->sk_state < RXRPC_CLOSE) {
|
||||
sk->sk_state = RXRPC_CLOSE;
|
||||
sk->sk_shutdown = SHUTDOWN_MASK;
|
||||
} else {
|
||||
ret = -ESHUTDOWN;
|
||||
}
|
||||
spin_unlock_bh(&sk->sk_receive_queue.lock);
|
||||
|
||||
rxrpc_discard_prealloc(rx);
|
||||
|
||||
@ -872,9 +870,7 @@ static int rxrpc_release_sock(struct sock *sk)
|
||||
break;
|
||||
}
|
||||
|
||||
spin_lock_bh(&sk->sk_receive_queue.lock);
|
||||
sk->sk_state = RXRPC_CLOSE;
|
||||
spin_unlock_bh(&sk->sk_receive_queue.lock);
|
||||
|
||||
if (rx->local && rcu_access_pointer(rx->local->service) == rx) {
|
||||
write_lock(&rx->local->services_lock);
|
||||
|
Loading…
Reference in New Issue
Block a user