diff options
Diffstat (limited to 'net/sunrpc/svcsock.c')
-rw-r--r-- | net/sunrpc/svcsock.c | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/net/sunrpc/svcsock.c b/net/sunrpc/svcsock.c index a33892733643..7e534dd09077 100644 --- a/net/sunrpc/svcsock.c +++ b/net/sunrpc/svcsock.c | |||
@@ -150,7 +150,6 @@ static void svc_set_cmsg_data(struct svc_rqst *rqstp, struct cmsghdr *cmh) | |||
150 | } | 150 | } |
151 | break; | 151 | break; |
152 | } | 152 | } |
153 | return; | ||
154 | } | 153 | } |
155 | 154 | ||
156 | /* | 155 | /* |
@@ -419,8 +418,8 @@ static void svc_udp_data_ready(struct sock *sk, int count) | |||
419 | set_bit(XPT_DATA, &svsk->sk_xprt.xpt_flags); | 418 | set_bit(XPT_DATA, &svsk->sk_xprt.xpt_flags); |
420 | svc_xprt_enqueue(&svsk->sk_xprt); | 419 | svc_xprt_enqueue(&svsk->sk_xprt); |
421 | } | 420 | } |
422 | if (sk->sk_sleep && waitqueue_active(sk->sk_sleep)) | 421 | if (sk_sleep(sk) && waitqueue_active(sk_sleep(sk))) |
423 | wake_up_interruptible(sk->sk_sleep); | 422 | wake_up_interruptible(sk_sleep(sk)); |
424 | } | 423 | } |
425 | 424 | ||
426 | /* | 425 | /* |
@@ -436,10 +435,10 @@ static void svc_write_space(struct sock *sk) | |||
436 | svc_xprt_enqueue(&svsk->sk_xprt); | 435 | svc_xprt_enqueue(&svsk->sk_xprt); |
437 | } | 436 | } |
438 | 437 | ||
439 | if (sk->sk_sleep && waitqueue_active(sk->sk_sleep)) { | 438 | if (sk_sleep(sk) && waitqueue_active(sk_sleep(sk))) { |
440 | dprintk("RPC svc_write_space: someone sleeping on %p\n", | 439 | dprintk("RPC svc_write_space: someone sleeping on %p\n", |
441 | svsk); | 440 | svsk); |
442 | wake_up_interruptible(sk->sk_sleep); | 441 | wake_up_interruptible(sk_sleep(sk)); |
443 | } | 442 | } |
444 | } | 443 | } |
445 | 444 | ||
@@ -751,8 +750,8 @@ static void svc_tcp_listen_data_ready(struct sock *sk, int count_unused) | |||
751 | printk("svc: socket %p: no user data\n", sk); | 750 | printk("svc: socket %p: no user data\n", sk); |
752 | } | 751 | } |
753 | 752 | ||
754 | if (sk->sk_sleep && waitqueue_active(sk->sk_sleep)) | 753 | if (sk_sleep(sk) && waitqueue_active(sk_sleep(sk))) |
755 | wake_up_interruptible_all(sk->sk_sleep); | 754 | wake_up_interruptible_all(sk_sleep(sk)); |
756 | } | 755 | } |
757 | 756 | ||
758 | /* | 757 | /* |
@@ -771,8 +770,8 @@ static void svc_tcp_state_change(struct sock *sk) | |||
771 | set_bit(XPT_CLOSE, &svsk->sk_xprt.xpt_flags); | 770 | set_bit(XPT_CLOSE, &svsk->sk_xprt.xpt_flags); |
772 | svc_xprt_enqueue(&svsk->sk_xprt); | 771 | svc_xprt_enqueue(&svsk->sk_xprt); |
773 | } | 772 | } |
774 | if (sk->sk_sleep && waitqueue_active(sk->sk_sleep)) | 773 | if (sk_sleep(sk) && waitqueue_active(sk_sleep(sk))) |
775 | wake_up_interruptible_all(sk->sk_sleep); | 774 | wake_up_interruptible_all(sk_sleep(sk)); |
776 | } | 775 | } |
777 | 776 | ||
778 | static void svc_tcp_data_ready(struct sock *sk, int count) | 777 | static void svc_tcp_data_ready(struct sock *sk, int count) |
@@ -785,8 +784,8 @@ static void svc_tcp_data_ready(struct sock *sk, int count) | |||
785 | set_bit(XPT_DATA, &svsk->sk_xprt.xpt_flags); | 784 | set_bit(XPT_DATA, &svsk->sk_xprt.xpt_flags); |
786 | svc_xprt_enqueue(&svsk->sk_xprt); | 785 | svc_xprt_enqueue(&svsk->sk_xprt); |
787 | } | 786 | } |
788 | if (sk->sk_sleep && waitqueue_active(sk->sk_sleep)) | 787 | if (sk_sleep(sk) && waitqueue_active(sk_sleep(sk))) |
789 | wake_up_interruptible(sk->sk_sleep); | 788 | wake_up_interruptible(sk_sleep(sk)); |
790 | } | 789 | } |
791 | 790 | ||
792 | /* | 791 | /* |
@@ -1481,8 +1480,8 @@ static void svc_sock_detach(struct svc_xprt *xprt) | |||
1481 | sk->sk_data_ready = svsk->sk_odata; | 1480 | sk->sk_data_ready = svsk->sk_odata; |
1482 | sk->sk_write_space = svsk->sk_owspace; | 1481 | sk->sk_write_space = svsk->sk_owspace; |
1483 | 1482 | ||
1484 | if (sk->sk_sleep && waitqueue_active(sk->sk_sleep)) | 1483 | if (sk_sleep(sk) && waitqueue_active(sk_sleep(sk))) |
1485 | wake_up_interruptible(sk->sk_sleep); | 1484 | wake_up_interruptible(sk_sleep(sk)); |
1486 | } | 1485 | } |
1487 | 1486 | ||
1488 | /* | 1487 | /* |