Commit 89c2be8a authored by NeilBrown's avatar NeilBrown Committed by Trond Myklebust
Browse files

NFS: discard NFS_RPC_SWAPFLAGS and RPC_TASK_ROOTCREDS 



NFS_RPC_SWAPFLAGS is only used for READ requests.
It sets RPC_TASK_SWAPPER which gives some memory-allocation priority to
requests.  This is not needed for swap READ - though it is for writes
where it is set via a different mechanism.

RPC_TASK_ROOTCREDS causes the 'machine' credential to be used.
This is not needed as the root credential is saved when the swap file is
opened, and this is used for all IO.

So NFS_RPC_SWAPFLAGS isn't needed, and as it is the only user of
RPC_TASK_ROOTCREDS, that isn't needed either.

Remove both.

Signed-off-by: default avatarNeilBrown <neilb@suse.de>
Signed-off-by: default avatarTrond Myklebust <trond.myklebust@hammerspace.com>
parent a80a8461

fs/nfs/read.c

+0 −4
Original line number Diff line number Diff line
@@ -194,10 +194,6 @@ static void nfs_initiate_read(struct nfs_pgio_header *hdr, 
			      const struct nfs_rpc_ops *rpc_ops,

			      struct rpc_task_setup *task_setup_data, int how)

{

	struct inode *inode = hdr->inode;

	int swap_flags = IS_SWAPFILE(inode) ? NFS_RPC_SWAPFLAGS : 0;



	task_setup_data->flags |= swap_flags;

	rpc_ops->read_setup(hdr, msg);

	trace_nfs_initiate_read(hdr);

}

include/linux/nfs_fs.h

+0 −5
Original line number Diff line number Diff line
@@ -45,11 +45,6 @@ 
 */

#define NFS_MAX_TRANSPORTS 16



/*

 * These are the default flags for swap requests

 */

#define NFS_RPC_SWAPFLAGS		(RPC_TASK_SWAPPER|RPC_TASK_ROOTCREDS)



/*

 * Size of the NFS directory verifier

 */

include/linux/sunrpc/sched.h

+0 −1
Original line number Diff line number Diff line
@@ -124,7 +124,6 @@ struct rpc_task_setup { 
#define RPC_TASK_MOVEABLE	0x0004		/* nfs4.1+ rpc tasks */

#define RPC_TASK_NULLCREDS	0x0010		/* Use AUTH_NULL credential */

#define RPC_CALL_MAJORSEEN	0x0020		/* major timeout seen */

#define RPC_TASK_ROOTCREDS	0x0040		/* force root creds */

#define RPC_TASK_DYNAMIC	0x0080		/* task was kmalloc'ed */

#define	RPC_TASK_NO_ROUND_ROBIN	0x0100		/* send requests on "main" xprt */

#define RPC_TASK_SOFT		0x0200		/* Use soft timeouts */

include/trace/events/sunrpc.h

+0 −1
Original line number Diff line number Diff line
@@ -311,7 +311,6 @@ TRACE_EVENT(rpc_request, 
		{ RPC_TASK_MOVEABLE, "MOVEABLE" },			\

		{ RPC_TASK_NULLCREDS, "NULLCREDS" },			\

		{ RPC_CALL_MAJORSEEN, "MAJORSEEN" },			\

		{ RPC_TASK_ROOTCREDS, "ROOTCREDS" },			\

		{ RPC_TASK_DYNAMIC, "DYNAMIC" },			\

		{ RPC_TASK_NO_ROUND_ROBIN, "NO_ROUND_ROBIN" },		\

		{ RPC_TASK_SOFT, "SOFT" },				\

net/sunrpc/auth.c

+1 −1
Original line number Diff line number Diff line
@@ -670,7 +670,7 @@ rpcauth_bindcred(struct rpc_task *task, const struct cred *cred, int flags) 
	/* If machine cred couldn't be bound, try a root cred */

	if (new)

		;

	else if (cred == &machine_cred || (flags & RPC_TASK_ROOTCREDS))

	else if (cred == &machine_cred)

		new = rpcauth_bind_root_cred(task, lookupflags);

	else if (flags & RPC_TASK_NULLCREDS)

		new = authnull_ops.lookup_cred(NULL, NULL, 0);