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

Commit 30660e04 authored by Jeff Layton's avatar Jeff Layton Committed by J. Bruce Fields
Browse files

sunrpc: move rq_usedeferral flag to rq_flags 



Signed-off-by: default avatarJeff Layton <jlayton@primarydata.com>
Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
parent 7501cc2b

fs/nfsd/nfs4proc.c

+2 −2
Original line number Diff line number Diff line
@@ -1370,7 +1370,7 @@ nfsd4_proc_compound(struct svc_rqst *rqstp, 
	 * Don't use the deferral mechanism for NFSv4; compounds make it

	 * too hard to avoid non-idempotency problems.

	 */

	rqstp->rq_usedeferral = false;

	clear_bit(RQ_USEDEFERRAL, &rqstp->rq_flags);



	/*

	 * According to RFC3010, this takes precedence over all other errors.
@@ -1486,7 +1486,7 @@ nfsd4_proc_compound(struct svc_rqst *rqstp, 
	BUG_ON(cstate->replay_owner);

out:

	/* Reset deferral mechanism for RPC deferrals */

	rqstp->rq_usedeferral = true;

	set_bit(RQ_USEDEFERRAL, &rqstp->rq_flags);

	dprintk("nfsv4 compound returned %d\n", ntohl(status));

	return status;

}

include/linux/sunrpc/svc.h

+1 −1
Original line number Diff line number Diff line
@@ -236,7 +236,6 @@ struct svc_rqst { 
	struct svc_cred		rq_cred;	/* auth info */

	void *			rq_xprt_ctxt;	/* transport specific context ptr */

	struct svc_deferred_req*rq_deferred;	/* deferred request we are replaying */

	bool			rq_usedeferral;	/* use deferral */



	size_t			rq_xprt_hlen;	/* xprt header len */

	struct xdr_buf		rq_arg;
@@ -255,6 +254,7 @@ struct svc_rqst { 
	u32			rq_prot;	/* IP protocol */

#define	RQ_SECURE	(0)			/* secure port */

#define	RQ_LOCAL	(1)			/* local request */

#define	RQ_USEDEFERRAL	(2)			/* use deferral */

	unsigned long		rq_flags;	/* flags field */



	void *			rq_argp;	/* decoded arguments */

include/trace/events/sunrpc.h

+5 −4
Original line number Diff line number Diff line
@@ -415,7 +415,8 @@ TRACE_EVENT(xs_tcp_data_recv, 
#define show_rqstp_flags(flags)						\

	__print_flags(flags, "|",					\

		{ (1UL << RQ_SECURE),		"RQ_SECURE"},		\

		{ (1UL << RQ_LOCAL),	"RQ_LOCAL"})

		{ (1UL << RQ_LOCAL),		"RQ_LOCAL"},		\

		{ (1UL << RQ_USEDEFERRAL),	"RQ_USEDEFERRAL"})



TRACE_EVENT(svc_recv,

	TP_PROTO(struct svc_rqst *rqst, int status),

net/sunrpc/svc.c

+1 −1
Original line number Diff line number Diff line
@@ -1090,7 +1090,7 @@ svc_process_common(struct svc_rqst *rqstp, struct kvec *argv, struct kvec *resv) 
	/* Will be turned off only in gss privacy case: */

	rqstp->rq_splice_ok = true;

	/* Will be turned off only when NFSv4 Sessions are used */

	rqstp->rq_usedeferral = true;

	set_bit(RQ_USEDEFERRAL, &rqstp->rq_flags);

	rqstp->rq_dropme = false;



	/* Setup reply header */

net/sunrpc/svc_xprt.c

+1 −1
Original line number Diff line number Diff line
@@ -1081,7 +1081,7 @@ static struct cache_deferred_req *svc_defer(struct cache_req *req) 
	struct svc_rqst *rqstp = container_of(req, struct svc_rqst, rq_chandle);

	struct svc_deferred_req *dr;



	if (rqstp->rq_arg.page_len || !rqstp->rq_usedeferral)

	if (rqstp->rq_arg.page_len || !test_bit(RQ_USEDEFERRAL, &rqstp->rq_flags))

		return NULL; /* if more than a page, give up FIXME */

	if (rqstp->rq_deferred) {

		dr = rqstp->rq_deferred;