projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
[cascardo/linux.git]
/
net
/
rxrpc
/
af_rxrpc.c
diff --git
a/net/rxrpc/af_rxrpc.c
b/net/rxrpc/af_rxrpc.c
index
44c9c2b
..
2d59c9b
100644
(file)
--- a/
net/rxrpc/af_rxrpc.c
+++ b/
net/rxrpc/af_rxrpc.c
@@
-678,9
+678,9
@@
static int rxrpc_release_sock(struct sock *sk)
sk->sk_state = RXRPC_CLOSE;
spin_unlock_bh(&sk->sk_receive_queue.lock);
sk->sk_state = RXRPC_CLOSE;
spin_unlock_bh(&sk->sk_receive_queue.lock);
- if (rx->local && r
x->local->service
== rx) {
+ if (rx->local && r
cu_access_pointer(rx->local->service)
== rx) {
write_lock(&rx->local->services_lock);
write_lock(&rx->local->services_lock);
- r
x->local->service = NULL
;
+ r
cu_assign_pointer(rx->local->service, NULL)
;
write_unlock(&rx->local->services_lock);
}
write_unlock(&rx->local->services_lock);
}