1 files changed, 11 insertions, 15 deletions

diff --git a/net/sunrpc/svcsock.c b/net/sunrpc/svcsock.c
index 2007881a5b26..603db98b8fca 100644
--- a/net/sunrpc/svcsock.c
+++ b/net/sunrpc/svcsock.c
@@ -776,11 +776,6 @@ svc_udp_recvfrom(struct svc_rqst *rqstp)
                 return svc_deferred_recv(rqstp);
         }
 
-        if (test_bit(SK_CLOSE, &svsk->sk_flags)) {
-                svc_delete_socket(svsk);
-                return 0;
-        }
-
         clear_bit(SK_DATA, &svsk->sk_flags);
         skb = NULL;
         err = kernel_recvmsg(svsk->sk_sock, &msg, NULL,
@@ -1181,11 +1176,6 @@ svc_tcp_recvfrom(struct svc_rqst *rqstp)
                 return svc_deferred_recv(rqstp);
         }
 
-        if (test_bit(SK_CLOSE, &svsk->sk_flags)) {
-                svc_delete_socket(svsk);
-                return 0;
-        }
-
         if (svsk->sk_sk->sk_state == TCP_LISTEN) {
                 svc_tcp_accept(svsk);
                 svc_sock_received(svsk);
@@ -1311,7 +1301,7 @@ svc_tcp_recvfrom(struct svc_rqst *rqstp)
         return len;
 
  err_delete:
-        svc_delete_socket(svsk);
+        set_bit(SK_CLOSE, &svsk->sk_flags);
         return -EAGAIN;
 
  error:
@@ -1575,10 +1565,16 @@ svc_recv(struct svc_rqst *rqstp, long timeout)
         }
         spin_unlock_bh(&pool->sp_lock);
 
-        dprintk("svc: server %p, pool %u, socket %p, inuse=%d\n",
-                 rqstp, pool->sp_id, svsk, atomic_read(&svsk->sk_inuse));
-        len = svsk->sk_xprt.xpt_ops->xpo_recvfrom(rqstp);
-        dprintk("svc: got len=%d\n", len);
+        len = 0;
+        if (test_bit(SK_CLOSE, &svsk->sk_flags)) {
+                dprintk("svc_recv: found SK_CLOSE\n");
+                svc_delete_socket(svsk);
+        } else {
+                dprintk("svc: server %p, pool %u, socket %p, inuse=%d\n",
+                        rqstp, pool->sp_id, svsk, atomic_read(&svsk->sk_inuse));
+                len = svsk->sk_xprt.xpt_ops->xpo_recvfrom(rqstp);
+                dprintk("svc: got len=%d\n", len);
+        }
 
         /* No data, incomplete (TCP) read, or accept() */
         if (len == 0 || len == -EAGAIN) {