Home Explore Help
Register Sign In
phyus
/
linux-vybrid_public
8
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

[NET] Cleanup: Use sock_owned_by_user() macro

Changes asserts in sunrpc to use sock_owned_by_user() macro instead of
referencing sock_lock.owner directly.

Signed-off-by: John Heffner <jheffner@psc.edu>
Signed-off-by: David S. Miller <davem@davemloft.net>
John Heffner 17 years ago
parent
ab0049b4a2
commit
02b3d34631
2 changed files with 2 additions and 2 deletions
Split View Show Diff Stats
  1. 1 1
      net/sunrpc/svcsock.c
  2. 1 1
      net/sunrpc/xprtsock.c

+ 1 - 1
net/sunrpc/svcsock.c
View File 

@@ -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",

+ 1 - 1
net/sunrpc/xprtsock.c
View File 

@@ -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",