From: J. Bruce Fields Date: Wed, 20 Aug 2014 20:18:32 +0000 (-0400) Subject: SUNRPC: Fix compile on non-x86 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=ae89254da6879cffa6a17327e5f3f60217b718cf;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git 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 Fixes: 983c684466e0 "SUNRPC: get rid of the request wait queue" Signed-off-by: J. Bruce Fields --- diff --git a/net/sunrpc/svc_xprt.c b/net/sunrpc/svc_xprt.c index c0db66d81e34..c179ca2a5aa4 100644 --- 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;