projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm
[powerpc.git]
/
net
/
sunrpc
/
svcsock.c
diff --git
a/net/sunrpc/svcsock.c
b/net/sunrpc/svcsock.c
index
406b3e6
..
c75bffe
100644
(file)
--- a/
net/sunrpc/svcsock.c
+++ b/
net/sunrpc/svcsock.c
@@
-104,7
+104,7
@@
static struct lock_class_key svc_slock_key[2];
static inline void svc_reclassify_socket(struct socket *sock)
{
struct sock *sk = sock->sk;
static inline void svc_reclassify_socket(struct socket *sock)
{
struct sock *sk = sock->sk;
- BUG_ON(s
k->sk_lock.owner != NULL
);
+ BUG_ON(s
ock_owned_by_user(sk)
);
switch (sk->sk_family) {
case AF_INET:
sock_lock_init_class_and_name(sk, "slock-AF_INET-NFSD",
switch (sk->sk_family) {
case AF_INET:
sock_lock_init_class_and_name(sk, "slock-AF_INET-NFSD",