SUNRPC: Fix compile on non-x86

current_task appears to be x86-only, oops.

Let's just delete this check entirely:

Any developer that adds a new user without setting rq_task will get a
crash the first time they test it.  I also don't think there are
normally any important locks held here, and I can't see any other reason
why killing a server thread would bring the whole box down.

So the effort to fail gracefully here looks like overkill.

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Fixes: 983c684466e0 "SUNRPC: get rid of the request wait queue"
Signed-off-by: J. Bruce Fields <bfields@redhat.com>

diff --git a/net/sunrpc/svc_xprt.c b/net/sunrpc/svc_xprt.c
index c0db66d81e344da69c2a80c903f14a5a231e5eaf..c179ca2a5aa45b8f37c44a660f50fc4b04c08273 100644 (file)
--- a/net/sunrpc/svc_xprt.c
+++ b/net/sunrpc/svc_xprt.c
@@ -771,10 +771,6 @@ int svc_recv(struct svc_rqst *rqstp, long timeout)
                        "svc_recv: service %p, transport not NULL!\n",
                         rqstp);
 
-       /* Make sure the task pointer is set! */
-       if (WARN_ON_ONCE(!rqstp->rq_task))
-               rqstp->rq_task = current_task;
-
        err = svc_alloc_arg(rqstp);
        if (err)
                return err;