[PATCH] knfsd: Drop 'serv' option to svc_recv and svc_process

It isn't needed as it is available in rqstp->rq_server, and dropping it allows
some local vars to be dropped.

[akpm@osdl.org: build fix]
Cc: "J. Bruce Fields" <bfields@fieldses.org>
Signed-off-by: Neil Brown <neilb@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

1 files changed, 2 insertions, 3 deletions

diff --git a/fs/nfs/callback.c b/fs/nfs/callback.c
index e244cdc7afab..7933e2e99dbc 100644
--- a/fs/nfs/callback.c
+++ b/fs/nfs/callback.c
@@ -58,7 +58,6 @@ module_param_call(callback_tcpport, param_set_port, param_get_int,
  */
 static void nfs_callback_svc(struct svc_rqst *rqstp)
 {
-        struct svc_serv *serv = rqstp->rq_server;
         int err;
 
         __module_get(THIS_MODULE);
@@ -80,7 +79,7 @@ static void nfs_callback_svc(struct svc_rqst *rqstp)
                 /*
                  * Listen for a request on the socket
                  */
-                err = svc_recv(serv, rqstp, MAX_SCHEDULE_TIMEOUT);
+                err = svc_recv(rqstp, MAX_SCHEDULE_TIMEOUT);
                 if (err == -EAGAIN || err == -EINTR)
                         continue;
                 if (err < 0) {
@@ -91,7 +90,7 @@ static void nfs_callback_svc(struct svc_rqst *rqstp)
                 }
                 dprintk("%s: request from %u.%u.%u.%u\n", __FUNCTION__,
                                 NIPQUAD(rqstp->rq_addr.sin_addr.s_addr));
-                svc_process(serv, rqstp);
+                svc_process(rqstp);
         }
 
         svc_exit_thread(rqstp);