7 files changed, 13 insertions, 15 deletions

diff --git a/fs/lockd/svc.c b/fs/lockd/svc.c
index 8d19de6a14dc..f0791cff45ac 100644
--- a/fs/lockd/svc.c
+++ b/fs/lockd/svc.c
@@ -98,7 +98,6 @@ static inline void clear_grace_period(void)
 static void
 lockd(struct svc_rqst *rqstp)
 {
-        struct svc_serv *serv = rqstp->rq_server;
         int             err = 0;
         unsigned long grace_period_expire;
 
@@ -114,7 +113,7 @@ lockd(struct svc_rqst *rqstp)
          * Let our maker know we're running.
          */
         nlmsvc_pid = current->pid;
-        nlmsvc_serv = serv;
+        nlmsvc_serv = rqstp->rq_server;
         complete(&lockd_start_done);
 
         daemonize("lockd");
@@ -164,7 +163,7 @@ lockd(struct svc_rqst *rqstp)
                  * Find a socket with data available and call its
                  * recvfrom routine.
                  */
-                err = svc_recv(serv, rqstp, timeout);
+                err = svc_recv(rqstp, timeout);
                 if (err == -EAGAIN || err == -EINTR)
                         continue;
                 if (err < 0) {
@@ -177,7 +176,7 @@ lockd(struct svc_rqst *rqstp)
                 dprintk("lockd: request from %08x\n",
                         (unsigned)ntohl(rqstp->rq_addr.sin_addr.s_addr));
 
-                svc_process(serv, rqstp);
+                svc_process(rqstp);
 
         }
 
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);
diff --git a/fs/nfsd/nfssvc.c b/fs/nfsd/nfssvc.c
index 784f94fbebf3..f1314c63e823 100644
--- a/fs/nfsd/nfssvc.c
+++ b/fs/nfsd/nfssvc.c
@@ -323,7 +323,6 @@ update_thread_usage(int busy_threads)
 static void
 nfsd(struct svc_rqst *rqstp)
 {
-        struct svc_serv *serv = rqstp->rq_server;
         struct fs_struct *fsp;
         int             err;
         struct nfsd_list me;
@@ -373,8 +372,7 @@ nfsd(struct svc_rqst *rqstp)
                  * Find a socket with data available and call its
                  * recvfrom routine.
                  */
-                while ((err = svc_recv(serv, rqstp,
-                                       60*60*HZ)) == -EAGAIN)
+                while ((err = svc_recv(rqstp, 60*60*HZ)) == -EAGAIN)
                         ;
                 if (err < 0)
                         break;
@@ -387,7 +385,7 @@ nfsd(struct svc_rqst *rqstp)
                 /* Process request with signals blocked.  */
                 sigprocmask(SIG_SETMASK, &allowed_mask, NULL);
 
-                svc_process(serv, rqstp);
+                svc_process(rqstp);
 
                 /* Unlock export hash tables */
                 exp_readunlock();
diff --git a/include/linux/sunrpc/svc.h b/include/linux/sunrpc/svc.h
index bff5e9b486c2..cb341f96eb8d 100644
--- a/include/linux/sunrpc/svc.h
+++ b/include/linux/sunrpc/svc.h
@@ -338,7 +338,7 @@ struct svc_serv *  svc_create(struct svc_program *, unsigned int,
 int                svc_create_thread(svc_thread_fn, struct svc_serv *);
 void               svc_exit_thread(struct svc_rqst *);
 void               svc_destroy(struct svc_serv *);
-int                svc_process(struct svc_serv *, struct svc_rqst *);
+int                svc_process(struct svc_rqst *);
 int                svc_register(struct svc_serv *, int, unsigned short);
 void               svc_wake_up(struct svc_serv *);
 void               svc_reserve(struct svc_rqst *rqstp, int space);
diff --git a/include/linux/sunrpc/svcsock.h b/include/linux/sunrpc/svcsock.h
index b8a9652b8755..d5f15e8db929 100644
--- a/include/linux/sunrpc/svcsock.h
+++ b/include/linux/sunrpc/svcsock.h
@@ -57,7 +57,7 @@ struct svc_sock {
  */
 int             svc_makesock(struct svc_serv *, int, unsigned short);
 void            svc_delete_socket(struct svc_sock *);
-int             svc_recv(struct svc_serv *, struct svc_rqst *, long);
+int             svc_recv(struct svc_rqst *, long);
 int             svc_send(struct svc_rqst *);
 void            svc_drop(struct svc_rqst *);
 void            svc_sock_update_bufs(struct svc_serv *serv);
diff --git a/net/sunrpc/svc.c b/net/sunrpc/svc.c
index f5aee4c61676..eee45a58f3ee 100644
--- a/net/sunrpc/svc.c
+++ b/net/sunrpc/svc.c
@@ -253,13 +253,14 @@ svc_register(struct svc_serv *serv, int proto, unsigned short port)
  * Process the RPC request.
  */
 int
-svc_process(struct svc_serv *serv, struct svc_rqst *rqstp)
+svc_process(struct svc_rqst *rqstp)
 {
         struct svc_program      *progp;
         struct svc_version      *versp = NULL;  /* compiler food */
         struct svc_procedure    *procp = NULL;
         struct kvec *           argv = &rqstp->rq_arg.head[0];
         struct kvec *           resv = &rqstp->rq_res.head[0];
+        struct svc_serv         *serv = rqstp->rq_server;
         kxdrproc_t              xdr;
         __be32                  *statp;
         u32                     dir, prog, vers, proc;
diff --git a/net/sunrpc/svcsock.c b/net/sunrpc/svcsock.c
index c6be67a86ae7..bc9bd189a540 100644
--- a/net/sunrpc/svcsock.c
+++ b/net/sunrpc/svcsock.c
@@ -1166,9 +1166,10 @@ svc_sock_update_bufs(struct svc_serv *serv)
  * Receive the next request on any socket.
  */
 int
-svc_recv(struct svc_serv *serv, struct svc_rqst *rqstp, long timeout)
+svc_recv(struct svc_rqst *rqstp, long timeout)
 {
         struct svc_sock         *svsk =NULL;
+        struct svc_serv         *serv = rqstp->rq_server;
         int                     len;
         int                     pages;
         struct xdr_buf          *arg;