Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6fb2b47f authored by NeilBrown's avatar NeilBrown Committed by Linus Torvalds
Browse files

[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: default avatarNeil Brown <neilb@suse.de>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 896440d5

fs/lockd/svc.c

+3 −4
Original line number Diff line number Diff line
@@ -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);



	}

fs/nfs/callback.c

+2 −3
Original line number Diff line number Diff line
@@ -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);

fs/nfsd/nfssvc.c

+2 −4
Original line number Diff line number Diff line
@@ -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();

include/linux/sunrpc/svc.h

+1 −1
Original line number Diff line number Diff line
@@ -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);

include/linux/sunrpc/svcsock.h

+1 −1
Original line number Diff line number Diff line
@@ -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);