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

Commit 99ade3c7 authored by Andrew Elble's avatar Andrew Elble Committed by Trond Myklebust
Browse files

nfs: machine credential support for additional operations 



Allow LAYOUTRETURN and DELEGRETURN to use machine credentials if the
server supports it. Add request for OPEN_DOWNGRADE as the close path
also uses that.

Signed-off-by: default avatarAndrew Elble <aweits@rit.edu>
Signed-off-by: default avatarTrond Myklebust <trond.myklebust@primarydata.com>
parent ed476752

fs/nfs/nfs4proc.c

+20 −0
Original line number Diff line number Diff line
@@ -5383,6 +5383,11 @@ static int _nfs4_proc_delegreturn(struct inode *inode, struct rpc_cred *cred, co 
	if (data == NULL)

		return -ENOMEM;

	nfs4_init_sequence(&data->args.seq_args, &data->res.seq_res, 1);



	nfs4_state_protect(server->nfs_client,

			NFS_SP4_MACH_CRED_CLEANUP,

			&task_setup_data.rpc_client, &msg);



	data->args.fhandle = &data->fh;

	data->args.stateid = &data->stateid;

	data->args.bitmask = server->cache_consistency_bitmask;
@@ -6859,10 +6864,13 @@ static const struct nfs41_state_protection nfs4_sp4_mach_cred_request = { 
	},

	.allow.u.words = {

		[0] = 1 << (OP_CLOSE) |

		      1 << (OP_OPEN_DOWNGRADE) |

		      1 << (OP_LOCKU) |

		      1 << (OP_DELEGRETURN) |

		      1 << (OP_COMMIT),

		[1] = 1 << (OP_SECINFO - 32) |

		      1 << (OP_SECINFO_NO_NAME - 32) |

		      1 << (OP_LAYOUTRETURN - 32) |

		      1 << (OP_TEST_STATEID - 32) |

		      1 << (OP_FREE_STATEID - 32) |

		      1 << (OP_WRITE - 32)
@@ -6927,11 +6935,19 @@ static int nfs4_sp4_select_mode(struct nfs_client *clp, 
		}



		if (test_bit(OP_CLOSE, sp->allow.u.longs) &&

		    test_bit(OP_OPEN_DOWNGRADE, sp->allow.u.longs) &&

		    test_bit(OP_DELEGRETURN, sp->allow.u.longs) &&

		    test_bit(OP_LOCKU, sp->allow.u.longs)) {

			dfprintk(MOUNT, "  cleanup mode enabled\n");

			set_bit(NFS_SP4_MACH_CRED_CLEANUP, &clp->cl_sp4_flags);

		}



		if (test_bit(OP_LAYOUTRETURN, sp->allow.u.longs)) {

			dfprintk(MOUNT, "  pnfs cleanup mode enabled\n");

			set_bit(NFS_SP4_MACH_CRED_PNFS_CLEANUP,

				&clp->cl_sp4_flags);

		}



		if (test_bit(OP_SECINFO, sp->allow.u.longs) &&

		    test_bit(OP_SECINFO_NO_NAME, sp->allow.u.longs)) {

			dfprintk(MOUNT, "  secinfo mode enabled\n");
@@ -8084,6 +8100,10 @@ int nfs4_proc_layoutreturn(struct nfs4_layoutreturn *lrp, bool sync) 
	};

	int status = 0;



	nfs4_state_protect(NFS_SERVER(lrp->args.inode)->nfs_client,

			NFS_SP4_MACH_CRED_PNFS_CLEANUP,

			&task_setup_data.rpc_client, &msg);



	dprintk("--> %s\n", __func__);

	if (!sync) {

		lrp->inode = nfs_igrab_and_active(lrp->args.inode);

include/linux/nfs_fs_sb.h

+1 −0
Original line number Diff line number Diff line
@@ -102,6 +102,7 @@ struct nfs_client { 
#define NFS_SP4_MACH_CRED_STATEID  4	/* TEST_STATEID and FREE_STATEID */

#define NFS_SP4_MACH_CRED_WRITE    5	/* WRITE */

#define NFS_SP4_MACH_CRED_COMMIT   6	/* COMMIT */

#define NFS_SP4_MACH_CRED_PNFS_CLEANUP  7 /* LAYOUTRETURN */

#endif /* CONFIG_NFS_V4 */



	/* Our own IP address, as a null-terminated string.