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

Commit 7501cc2b authored by Jeff Layton's avatar Jeff Layton Committed by J. Bruce Fields
Browse files

sunrpc: move rq_local field to rq_flags 



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

fs/nfsd/vfs.c

+2 −2
Original line number Diff line number Diff line
@@ -962,7 +962,7 @@ nfsd_vfs_write(struct svc_rqst *rqstp, struct svc_fh *fhp, struct file *file, 
	loff_t			end = LLONG_MAX;

	unsigned int		pflags = current->flags;



	if (rqstp->rq_local)

	if (test_bit(RQ_LOCAL, &rqstp->rq_flags))

		/*

		 * We want less throttling in balance_dirty_pages()

		 * and shrink_inactive_list() so that nfs to
@@ -1006,7 +1006,7 @@ nfsd_vfs_write(struct svc_rqst *rqstp, struct svc_fh *fhp, struct file *file, 
		err = 0;

	else

		err = nfserrno(host_err);

	if (rqstp->rq_local)

	if (test_bit(RQ_LOCAL, &rqstp->rq_flags))

		tsk_restore_flags(current, pflags, PF_LESS_THROTTLE);

	return err;

}

include/linux/sunrpc/svc.h

+1 −1
Original line number Diff line number Diff line
@@ -254,8 +254,8 @@ struct svc_rqst { 
	u32			rq_proc;	/* procedure number */

	u32			rq_prot;	/* IP protocol */

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

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

	unsigned long		rq_flags;	/* flags field */

	unsigned short		rq_local   : 1;	/* local request */



	void *			rq_argp;	/* decoded arguments */

	void *			rq_resp;	/* xdr'd results */

include/trace/events/sunrpc.h

+2 −1
Original line number Diff line number Diff line
@@ -414,7 +414,8 @@ TRACE_EVENT(xs_tcp_data_recv, 


#define show_rqstp_flags(flags)				\

	__print_flags(flags, "|",			\

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

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

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



TRACE_EVENT(svc_recv,

	TP_PROTO(struct svc_rqst *rqst, int status),

net/sunrpc/svcsock.c

+4 −1
Original line number Diff line number Diff line
@@ -1145,7 +1145,10 @@ static int svc_tcp_recvfrom(struct svc_rqst *rqstp) 


	rqstp->rq_xprt_ctxt   = NULL;

	rqstp->rq_prot	      = IPPROTO_TCP;

	rqstp->rq_local	      = !!test_bit(XPT_LOCAL, &svsk->sk_xprt.xpt_flags);

	if (test_bit(XPT_LOCAL, &svsk->sk_xprt.xpt_flags))

		set_bit(RQ_LOCAL, &rqstp->rq_flags);

	else

		clear_bit(RQ_LOCAL, &rqstp->rq_flags);



	p = (__be32 *)rqstp->rq_arg.head[0].iov_base;

	calldir = p[1];