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

Commit 4b5b3ba1 authored by Andy Adamson's avatar Andy Adamson Committed by Trond Myklebust
Browse files

SUNRPC move svc_drop to caller of svc_process_common 



The NFSv4.1 shared back channel does not need to call svc_drop because the
callback service never outlives the single connection it services, and it
reuses it's buffers and keeps the trasport.

Signed-off-by: default avatarAndy Adamson <andros@netapp.com>
Acked-by: default avatarBruce Fields <bfields@redhat.com>
Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent 64c2ce8b

net/sunrpc/svc.c

+16 −14
Original line number Diff line number Diff line
@@ -1147,7 +1147,6 @@ svc_process_common(struct svc_rqst *rqstp, struct kvec *argv, struct kvec *resv) 
 dropit:

	svc_authorise(rqstp);	/* doesn't hurt to call this twice */

	dprintk("svc: svc_process dropit\n");

	svc_drop(rqstp);

	return 0;



err_short_len:
@@ -1218,7 +1217,6 @@ svc_process(struct svc_rqst *rqstp) 
	struct kvec		*resv = &rqstp->rq_res.head[0];

	struct svc_serv		*serv = rqstp->rq_server;

	u32			dir;

	int			error;



	/*

	 * Setup response xdr_buf.
@@ -1246,11 +1244,13 @@ svc_process(struct svc_rqst *rqstp) 
		return 0;

	}



	error = svc_process_common(rqstp, argv, resv);

	if (error <= 0)

		return error;



	/* Returns 1 for send, 0 for drop */

	if (svc_process_common(rqstp, argv, resv))

		return svc_send(rqstp);

	else {

		svc_drop(rqstp);

		return 0;

	}

}



#if defined(CONFIG_NFS_V4_1)
@@ -1264,7 +1264,6 @@ bc_svc_process(struct svc_serv *serv, struct rpc_rqst *req, 
{

	struct kvec	*argv = &rqstp->rq_arg.head[0];

	struct kvec	*resv = &rqstp->rq_res.head[0];

	int 		error;



	/* Build the svc_rqst used by the common processing routine */

	rqstp->rq_xprt = serv->bc_xprt;
@@ -1292,12 +1291,15 @@ bc_svc_process(struct svc_serv *serv, struct rpc_rqst *req, 
	svc_getu32(argv);	/* XID */

	svc_getnl(argv);	/* CALLDIR */



	error = svc_process_common(rqstp, argv, resv);

	if (error <= 0)

		return error;



	memcpy(&req->rq_snd_buf, &rqstp->rq_res, sizeof(req->rq_snd_buf));

	/* Returns 1 for send, 0 for drop */

	if (svc_process_common(rqstp, argv, resv)) {

		memcpy(&req->rq_snd_buf, &rqstp->rq_res,

						sizeof(req->rq_snd_buf));

		return bc_send(req);

	} else {

		/* Nothing to do to drop request */

		return 0;

	}

}

EXPORT_SYMBOL(bc_svc_process);

#endif /* CONFIG_NFS_V4_1 */