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

Commit 779fb0f3 authored by Jeff Layton's avatar Jeff Layton Committed by J. Bruce Fields
Browse files

sunrpc: move rq_splice_ok flag into rq_flags 



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

fs/nfsd/nfs4proc.c

+1 −1
Original line number Diff line number Diff line
@@ -773,7 +773,7 @@ nfsd4_read(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, 
	 * the client wants us to do more in this compound:

	 */

	if (!nfsd4_last_compound_op(rqstp))

		rqstp->rq_splice_ok = false;

		clear_bit(RQ_SPLICE_OK, &rqstp->rq_flags);



	/* check stateid */

	if ((status = nfs4_preprocess_stateid_op(SVC_NET(rqstp),

fs/nfsd/nfs4xdr.c

+4 −4
Original line number Diff line number Diff line
@@ -1731,7 +1731,7 @@ nfsd4_decode_compound(struct nfsd4_compoundargs *argp) 
	argp->rqstp->rq_cachetype = cachethis ? RC_REPLBUFF : RC_NOCACHE;



	if (readcount > 1 || max_reply > PAGE_SIZE - auth_slack)

		argp->rqstp->rq_splice_ok = false;

		clear_bit(RQ_SPLICE_OK, &argp->rqstp->rq_flags);



	DECODE_TAIL;

}
@@ -3253,10 +3253,10 @@ nfsd4_encode_read(struct nfsd4_compoundres *resp, __be32 nfserr, 


	p = xdr_reserve_space(xdr, 8); /* eof flag and byte count */

	if (!p) {

		WARN_ON_ONCE(resp->rqstp->rq_splice_ok);

		WARN_ON_ONCE(test_bit(RQ_SPLICE_OK, &resp->rqstp->rq_flags));

		return nfserr_resource;

	}

	if (resp->xdr.buf->page_len && resp->rqstp->rq_splice_ok) {

	if (resp->xdr.buf->page_len && test_bit(RQ_SPLICE_OK, &resp->rqstp->rq_flags)) {

		WARN_ON_ONCE(1);

		return nfserr_resource;

	}
@@ -3273,7 +3273,7 @@ nfsd4_encode_read(struct nfsd4_compoundres *resp, __be32 nfserr, 
			goto err_truncate;

	}



	if (file->f_op->splice_read && resp->rqstp->rq_splice_ok)

	if (file->f_op->splice_read && test_bit(RQ_SPLICE_OK, &resp->rqstp->rq_flags))

		err = nfsd4_encode_splice_read(resp, read, file, maxcount);

	else

		err = nfsd4_encode_readv(resp, read, file, maxcount);

fs/nfsd/vfs.c

+1 −1
Original line number Diff line number Diff line
@@ -902,7 +902,7 @@ static __be32 
nfsd_vfs_read(struct svc_rqst *rqstp, struct file *file,

	      loff_t offset, struct kvec *vec, int vlen, unsigned long *count)

{

	if (file->f_op->splice_read && rqstp->rq_splice_ok)

	if (file->f_op->splice_read && test_bit(RQ_SPLICE_OK, &rqstp->rq_flags))

		return nfsd_splice_read(rqstp, file, offset, count);

	else

		return nfsd_readv(file, offset, vec, vlen, count);

include/linux/sunrpc/svc.h

+3 −3
Original line number Diff line number Diff line
@@ -256,6 +256,9 @@ struct svc_rqst { 
#define	RQ_LOCAL	(1)			/* local request */

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

#define	RQ_DROPME	(3)			/* drop current reply */

#define	RQ_SPLICE_OK	(4)			/* turned off in gss privacy

						 * to prevent encrypting page

						 * cache pages */

	unsigned long		rq_flags;	/* flags field */



	void *			rq_argp;	/* decoded arguments */
@@ -277,9 +280,6 @@ struct svc_rqst { 
	struct auth_domain *	rq_gssclient;	/* "gss/"-style peer info */

	int			rq_cachetype;

	struct svc_cacherep *	rq_cacherep;	/* cache info */

	bool			rq_splice_ok;   /* turned off in gss privacy

						 * to prevent encrypting page

						 * cache pages */

	struct task_struct	*rq_task;	/* service thread */

};

include/trace/events/sunrpc.h

+2 −1
Original line number Diff line number Diff line
@@ -417,7 +417,8 @@ TRACE_EVENT(xs_tcp_data_recv, 
		{ (1UL << RQ_SECURE),		"RQ_SECURE"},		\

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

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

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

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

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



TRACE_EVENT(svc_recv,

	TP_PROTO(struct svc_rqst *rqst, int status),