SUNRPC: call svc_process() from svc_recv().

All callers of svc_recv() go on to call svc_process() on success.
Simplify callers by having svc_recv() do that for them.

This loses one call to validate_process_creds() in nfsd.  That was
debugging code added 14 years ago.  I don't think we need to keep it.

Signed-off-by: NeilBrown <neilb@suse.de>
Reviewed-by: Jeff Layton <jlayton@kernel.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>

diff --git a/fs/lockd/svc.c b/fs/lockd/svc.c
index 614faa5f69cd8d0613ec4f63fbdcb02df7a84fde..91ef139a7757c9826fb936fcf5c7633a46ef0e22 100644 (file)
--- a/fs/lockd/svc.c
+++ b/fs/lockd/svc.c
@@ -132,7 +132,6 @@ lockd(void *vrqstp)
         */
        while (!kthread_should_stop()) {
                long timeout = MAX_SCHEDULE_TIMEOUT;
-               RPC_IFDEBUG(char buf[RPC_MAX_ADDRBUFLEN]);
 
                /* update sv_maxconn if it has changed */
                rqstp->rq_server->sv_maxconn = nlm_max_connections;
@@ -146,10 +145,6 @@ lockd(void *vrqstp)
                err = svc_recv(rqstp, timeout);
                if (err == -EAGAIN || err == -EINTR)
                        continue;
-               dprintk("lockd: request from %s\n",
-                               svc_print_addr(rqstp, buf, sizeof(buf)));
-
-               svc_process(rqstp);
        }
        if (nlmsvc_ops)
                nlmsvc_invalidate_all();

diff --git a/fs/nfs/callback.c b/fs/nfs/callback.c
index 46a0a2d6962e1c81b8dbb6663748befb5bb93f3a..2d94384bd6a99745f2524e024b0008cabff0e362 100644 (file)
--- a/fs/nfs/callback.c
+++ b/fs/nfs/callback.c
@@ -86,7 +86,6 @@ nfs4_callback_svc(void *vrqstp)
                err = svc_recv(rqstp, MAX_SCHEDULE_TIMEOUT);
                if (err == -EAGAIN || err == -EINTR)
                        continue;
-               svc_process(rqstp);
        }
 
        svc_exit_thread(rqstp);

diff --git a/fs/nfsd/nfssvc.c b/fs/nfsd/nfssvc.c
index a0b16e3dd91ac476a50e5768a5c819924f442cd7..547feb8ad0af70f4efa5b2a5f146cfd347ba4b9c 100644 (file)
--- a/fs/nfsd/nfssvc.c
+++ b/fs/nfsd/nfssvc.c
@@ -970,8 +970,7 @@ nfsd(void *vrqstp)
                        ;
                if (err == -EINTR)
                        break;
-               validate_process_creds();
-               svc_process(rqstp);
+
                validate_process_creds();
        }
 

diff --git a/net/sunrpc/svc.c b/net/sunrpc/svc.c
index 587811a002c98bf90bbc57c3109a33143ba9f2c8..c69896c124a4f3c32d3129c566e26ca29b978f0f 100644 (file)
--- a/net/sunrpc/svc.c
+++ b/net/sunrpc/svc.c
@@ -1516,7 +1516,6 @@ out_baddir:
 out_drop:
        svc_drop(rqstp);
 }
-EXPORT_SYMBOL_GPL(svc_process);
 
 #if defined(CONFIG_SUNRPC_BACKCHANNEL)
 /*

diff --git a/net/sunrpc/svc_xprt.c b/net/sunrpc/svc_xprt.c
index d4a7fd5aabd14760c3800bd4330230c28769eb98..8430b151bd71632d1b38585b1fa655474b6f40e0 100644 (file)
--- a/net/sunrpc/svc_xprt.c
+++ b/net/sunrpc/svc_xprt.c
@@ -906,7 +906,8 @@ int svc_recv(struct svc_rqst *rqstp, long timeout)
        if (serv->sv_stats)
                serv->sv_stats->netcnt++;
        rqstp->rq_stime = ktime_get();
-       return len;
+       svc_process(rqstp);
+       return 0;
 out_release:
        rqstp->rq_res.len = 0;
        svc_xprt_release(rqstp);