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

Commit 011e2a7f authored by Bryan Schumaker's avatar Bryan Schumaker Committed by Trond Myklebust
Browse files

NFS: Create a have_delegation rpc_op 



Delegations are a v4 feature, so push them out of the generic code.

Signed-off-by: default avatarBryan Schumaker <bjschuma@netapp.com>
Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent a5c58892

fs/nfs/delegation.c

+1 −1
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ void nfs_mark_delegation_referenced(struct nfs_delegation *delegation) 
 *

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

 */

int nfs_have_delegation(struct inode *inode, fmode_t flags)

int nfs4_have_delegation(struct inode *inode, fmode_t flags)

{

	struct nfs_delegation *delegation;

	int ret = 0;

fs/nfs/delegation.h

+2 −7
Original line number Diff line number Diff line
@@ -56,14 +56,9 @@ int nfs4_lock_delegation_recall(struct nfs4_state *state, struct file_lock *fl); 
bool nfs4_copy_delegation_stateid(nfs4_stateid *dst, struct inode *inode, fmode_t flags);



void nfs_mark_delegation_referenced(struct nfs_delegation *delegation);

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

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



#else

static inline int nfs_have_delegation(struct inode *inode, fmode_t flags)

{

	return 0;

}



static inline int nfs_inode_return_delegation(struct inode *inode)

{

	nfs_wb_all(inode);
@@ -73,7 +68,7 @@ static inline int nfs_inode_return_delegation(struct inode *inode) 


static inline int nfs_have_delegated_attributes(struct inode *inode)

{

	return nfs_have_delegation(inode, FMODE_READ) &&

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

		!(NFS_I(inode)->cache_validity & NFS_INO_REVAL_FORCED);

}

fs/nfs/dir.c

+1 −1
Original line number Diff line number Diff line
@@ -1144,7 +1144,7 @@ static int nfs_lookup_revalidate(struct dentry *dentry, struct nameidata *nd) 
		goto out_bad;

	}



	if (nfs_have_delegation(inode, FMODE_READ))

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

		goto out_set_verifier;



	/* Force a full look up iff the parent directory has changed */

fs/nfs/file.c

+3 −3
Original line number Diff line number Diff line
@@ -178,7 +178,7 @@ nfs_file_flush(struct file *file, fl_owner_t id) 
	 * If we're holding a write delegation, then just start the i/o

	 * but don't wait for completion (or send a commit).

	 */

	if (nfs_have_delegation(inode, FMODE_WRITE))

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

		return filemap_fdatawrite(file->f_mapping);



	/* Flush writes to the server and return any errors */
@@ -677,7 +677,7 @@ do_getlk(struct file *filp, int cmd, struct file_lock *fl, int is_local) 
	}

	fl->fl_type = saved_type;



	if (nfs_have_delegation(inode, FMODE_READ))

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

		goto out_noconflict;



	if (is_local)
@@ -772,7 +772,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_have_delegation(inode, FMODE_READ)) {

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

		if (is_time_granular(&NFS_SERVER(inode)->time_delta))

			__nfs_revalidate_inode(NFS_SERVER(inode), inode);

		else

fs/nfs/inode.c

+1 −1
Original line number Diff line number Diff line
@@ -1457,7 +1457,7 @@ static int nfs_update_inode(struct inode *inode, struct nfs_fattr *fattr) 
	if (!(S_ISREG(inode->i_mode) || S_ISDIR(inode->i_mode)

				|| S_ISLNK(inode->i_mode)))

		invalid &= ~NFS_INO_INVALID_DATA;

	if (!nfs_have_delegation(inode, FMODE_READ) ||

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

			(save_cache_validity & NFS_INO_REVAL_FORCED))

		nfsi->cache_validity |= invalid;