From f34b841df3b38cef55ffc18017ab9c47e968d704 Mon Sep 17 00:00:00 2001 From: John Heffner Date: Wed, 12 Sep 2007 10:42:12 +0200 Subject: [PATCH] --- yaml --- r: 66374 b: refs/heads/master c: 02b3d34631831a19ee691516e233756b270eac6d h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/sunrpc/svcsock.c | 2 +- trunk/net/sunrpc/xprtsock.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 0df1ad5580c1..12788902ae56 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ab0049b4a2f66074dff6af851b35bba888f53972 +refs/heads/master: 02b3d34631831a19ee691516e233756b270eac6d diff --git a/trunk/net/sunrpc/svcsock.c b/trunk/net/sunrpc/svcsock.c index 406b3e687952..c75bffeb89eb 100644 --- a/trunk/net/sunrpc/svcsock.c +++ b/trunk/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; - BUG_ON(sk->sk_lock.owner != NULL); + BUG_ON(sock_owned_by_user(sk)); switch (sk->sk_family) { case AF_INET: sock_lock_init_class_and_name(sk, "slock-AF_INET-NFSD", diff --git a/trunk/net/sunrpc/xprtsock.c b/trunk/net/sunrpc/xprtsock.c index 4ae7eed7f617..282efd447a61 100644 --- a/trunk/net/sunrpc/xprtsock.c +++ b/trunk/net/sunrpc/xprtsock.c @@ -1186,7 +1186,7 @@ static struct lock_class_key xs_slock_key[2]; static inline void xs_reclassify_socket(struct socket *sock) { struct sock *sk = sock->sk; - BUG_ON(sk->sk_lock.owner != NULL); + BUG_ON(sock_owned_by_user(sk)); switch (sk->sk_family) { case AF_INET: sock_lock_init_class_and_name(sk, "slock-AF_INET-NFS",