Commit 02b3d346 authored by John Heffner's avatar John Heffner Committed by David S. Miller
Browse files

[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: default avatarJohn Heffner <jheffner@psc.edu>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ab0049b4

net/sunrpc/svcsock.c

+1 −1
Original line number Diff line number Diff line
@@ -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",

net/sunrpc/xprtsock.c

+1 −1
Original line number Diff line number Diff line
@@ -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",