Commit 4201916f authored by Trond Myklebust's avatar Trond Myklebust Committed by Anna Schumaker
Browse files

NFSv4: Add a flags argument to the 'have_delegation' callback 



This argument will be used to allow the caller to specify whether or not
they need to know that this is an attribute delegation.

Signed-off-by: default avatarTrond Myklebust <trond.myklebust@primarydata.com>
Signed-off-by: default avatarLance Shelton <lance.shelton@hammerspace.com>
Reviewed-by: default avatarJeff Layton <jlayton@kernel.org>
Signed-off-by: default avatarTrond Myklebust <trond.myklebust@hammerspace.com>
Signed-off-by: default avatarAnna Schumaker <Anna.Schumaker@Netapp.com>
parent 43df7110

fs/nfs/delegation.c

+13 −13
Original line number Diff line number Diff line
@@ -82,11 +82,10 @@ static void nfs_mark_return_delegation(struct nfs_server *server, 
	set_bit(NFS4CLNT_DELEGRETURN, &server->nfs_client->cl_state);

}



static bool

nfs4_is_valid_delegation(const struct nfs_delegation *delegation,

		fmode_t flags)

static bool nfs4_is_valid_delegation(const struct nfs_delegation *delegation,

				     fmode_t type)

{

	if (delegation != NULL && (delegation->type & flags) == flags &&

	if (delegation != NULL && (delegation->type & type) == type &&

	    !test_bit(NFS_DELEGATION_REVOKED, &delegation->flags) &&

	    !test_bit(NFS_DELEGATION_RETURNING, &delegation->flags))

		return true;
@@ -103,16 +102,16 @@ struct nfs_delegation *nfs4_get_valid_delegation(const struct inode *inode) 
	return NULL;

}



static int

nfs4_do_check_delegation(struct inode *inode, fmode_t flags, bool mark)

static int nfs4_do_check_delegation(struct inode *inode, fmode_t type,

				    int flags, bool mark)

{

	struct nfs_delegation *delegation;

	int ret = 0;



	flags &= FMODE_READ|FMODE_WRITE;

	type &= FMODE_READ|FMODE_WRITE;

	rcu_read_lock();

	delegation = rcu_dereference(NFS_I(inode)->delegation);

	if (nfs4_is_valid_delegation(delegation, flags)) {

	if (nfs4_is_valid_delegation(delegation, type)) {

		if (mark)

			nfs_mark_delegation_referenced(delegation);

		ret = 1;
@@ -124,22 +123,23 @@ nfs4_do_check_delegation(struct inode *inode, fmode_t flags, bool mark) 
 * nfs4_have_delegation - check if inode has a delegation, mark it

 * NFS_DELEGATION_REFERENCED if there is one.

 * @inode: inode to check

 * @flags: delegation types to check for

 * @type: delegation types to check for

 * @flags: various modifiers

 *

 * Returns one if inode has the indicated delegation, otherwise zero.

 */

int nfs4_have_delegation(struct inode *inode, fmode_t flags)

int nfs4_have_delegation(struct inode *inode, fmode_t type, int flags)

{

	return nfs4_do_check_delegation(inode, flags, true);

	return nfs4_do_check_delegation(inode, type, flags, true);

}



/*

 * nfs4_check_delegation - check if inode has a delegation, do not mark

 * NFS_DELEGATION_REFERENCED if it has one.

 */

int nfs4_check_delegation(struct inode *inode, fmode_t flags)

int nfs4_check_delegation(struct inode *inode, fmode_t type)

{

	return nfs4_do_check_delegation(inode, flags, false);

	return nfs4_do_check_delegation(inode, type, 0, false);

}



static int nfs_delegation_claim_locks(struct nfs4_state *state, const nfs4_stateid *stateid)

fs/nfs/delegation.h

+13 −3
Original line number Diff line number Diff line
@@ -75,8 +75,8 @@ bool nfs4_refresh_delegation_stateid(nfs4_stateid *dst, struct inode *inode); 


struct nfs_delegation *nfs4_get_valid_delegation(const struct inode *inode);

void nfs_mark_delegation_referenced(struct nfs_delegation *delegation);

int nfs4_have_delegation(struct inode *inode, fmode_t flags);

int nfs4_check_delegation(struct inode *inode, fmode_t flags);

int nfs4_have_delegation(struct inode *inode, fmode_t type, int flags);

int nfs4_check_delegation(struct inode *inode, fmode_t type);

bool nfs4_delegation_flush_on_close(const struct inode *inode);

void nfs_inode_find_delegation_state_and_recover(struct inode *inode,

		const nfs4_stateid *stateid);
@@ -84,9 +84,19 @@ int nfs4_inode_make_writeable(struct inode *inode); 


#endif



static inline int nfs_have_read_or_write_delegation(struct inode *inode)

{

	return NFS_PROTO(inode)->have_delegation(inode, FMODE_READ, 0);

}



static inline int nfs_have_write_delegation(struct inode *inode)

{

	return NFS_PROTO(inode)->have_delegation(inode, FMODE_WRITE, 0);

}



static inline int nfs_have_delegated_attributes(struct inode *inode)

{

	return NFS_PROTO(inode)->have_delegation(inode, FMODE_READ);

	return NFS_PROTO(inode)->have_delegation(inode, FMODE_READ, 0);

}



#endif

fs/nfs/dir.c

+1 −1
Original line number Diff line number Diff line
@@ -1437,7 +1437,7 @@ static void nfs_set_verifier_locked(struct dentry *dentry, unsigned long verf) 


	if (!dir || !nfs_verify_change_attribute(dir, verf))

		return;

	if (inode && NFS_PROTO(inode)->have_delegation(inode, FMODE_READ))

	if (inode && NFS_PROTO(inode)->have_delegation(inode, FMODE_READ, 0))

		nfs_set_verifier_delegated(&verf);

	dentry->d_time = verf;

}

fs/nfs/file.c

+2 −2
Original line number Diff line number Diff line
@@ -732,7 +732,7 @@ do_getlk(struct file *filp, int cmd, struct file_lock *fl, int is_local) 
	}

	fl->c.flc_type = saved_type;



	if (NFS_PROTO(inode)->have_delegation(inode, FMODE_READ))

	if (nfs_have_read_or_write_delegation(inode))

		goto out_noconflict;



	if (is_local)
@@ -815,7 +815,7 @@ do_setlk(struct file *filp, int cmd, struct file_lock *fl, int is_local) 
	 * This makes locking act as a cache coherency point.

	 */

	nfs_sync_mapping(filp->f_mapping);

	if (!NFS_PROTO(inode)->have_delegation(inode, FMODE_READ)) {

	if (!nfs_have_read_or_write_delegation(inode)) {

		nfs_zap_caches(inode);

		if (mapping_mapped(filp->f_mapping))

			nfs_revalidate_mapping(inode, filp->f_mapping);

fs/nfs/inode.c

+3 −4
Original line number Diff line number Diff line
@@ -190,9 +190,8 @@ static bool nfs_has_xattr_cache(const struct nfs_inode *nfsi) 
void nfs_set_cache_invalid(struct inode *inode, unsigned long flags)

{

	struct nfs_inode *nfsi = NFS_I(inode);

	bool have_delegation = NFS_PROTO(inode)->have_delegation(inode, FMODE_READ);



	if (have_delegation) {

	if (nfs_have_delegated_attributes(inode)) {

		if (!(flags & NFS_INO_REVAL_FORCED))

			flags &= ~(NFS_INO_INVALID_MODE |

				   NFS_INO_INVALID_OTHER |
@@ -1013,7 +1012,7 @@ void nfs_close_context(struct nfs_open_context *ctx, int is_sync) 
	if (!is_sync)

		return;

	inode = d_inode(ctx->dentry);

	if (NFS_PROTO(inode)->have_delegation(inode, FMODE_READ))

	if (nfs_have_read_or_write_delegation(inode))

		return;

	nfsi = NFS_I(inode);

	if (inode->i_mapping->nrpages == 0)
@@ -1483,7 +1482,7 @@ static int nfs_check_inode_attributes(struct inode *inode, struct nfs_fattr *fat 
	unsigned long invalid = 0;

	struct timespec64 ts;



	if (NFS_PROTO(inode)->have_delegation(inode, FMODE_READ))

	if (nfs_have_delegated_attributes(inode))

		return 0;



	if (!(fattr->valid & NFS_ATTR_FATTR_FILEID)) {