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

Commit 57ec14c5 authored by Bryan Schumaker's avatar Bryan Schumaker Committed by Trond Myklebust
Browse files

NFS: Create a return_delegation rpc op 



Delegations are a v4 feature, so push return_delegation out of the
generic client by creating a new rpc_op and renaming the old function to
be in the nfs v4 "namespace"

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

fs/nfs/delegation.c

+1 −1
Original line number Diff line number Diff line
@@ -388,7 +388,7 @@ void nfs_inode_return_delegation_noreclaim(struct inode *inode) 
 *

 * Returns zero on success, or a negative errno value.

 */

int nfs_inode_return_delegation(struct inode *inode)

int nfs4_inode_return_delegation(struct inode *inode)

{

	struct nfs_server *server = NFS_SERVER(inode);

	struct nfs_inode *nfsi = NFS_I(inode);

fs/nfs/delegation.h

+1 −7
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ enum { 


int nfs_inode_set_delegation(struct inode *inode, struct rpc_cred *cred, struct nfs_openres *res);

void nfs_inode_reclaim_delegation(struct inode *inode, struct rpc_cred *cred, struct nfs_openres *res);

int nfs_inode_return_delegation(struct inode *inode);

int nfs4_inode_return_delegation(struct inode *inode);

int nfs_async_inode_return_delegation(struct inode *inode, const nfs4_stateid *stateid);

void nfs_inode_return_delegation_noreclaim(struct inode *inode);
@@ -58,12 +58,6 @@ bool nfs4_copy_delegation_stateid(nfs4_stateid *dst, struct inode *inode, fmode_ 
void nfs_mark_delegation_referenced(struct nfs_delegation *delegation);

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



#else

static inline int nfs_inode_return_delegation(struct inode *inode)

{

	nfs_wb_all(inode);

	return 0;

}

#endif



static inline int nfs_have_delegated_attributes(struct inode *inode)

fs/nfs/dir.c

+4 −4
Original line number Diff line number Diff line
@@ -1778,7 +1778,7 @@ static int nfs_safe_remove(struct dentry *dentry) 
	}



	if (inode != NULL) {

		nfs_inode_return_delegation(inode);

		NFS_PROTO(inode)->return_delegation(inode);

		error = NFS_PROTO(dir)->remove(dir, &dentry->d_name);

		/* The VFS may want to delete this inode */

		if (error == 0)
@@ -1906,7 +1906,7 @@ nfs_link(struct dentry *old_dentry, struct inode *dir, struct dentry *dentry) 
		old_dentry->d_parent->d_name.name, old_dentry->d_name.name,

		dentry->d_parent->d_name.name, dentry->d_name.name);



	nfs_inode_return_delegation(inode);

	NFS_PROTO(inode)->return_delegation(inode);



	d_drop(dentry);

	error = NFS_PROTO(dir)->link(inode, dir, &dentry->d_name);
@@ -1990,9 +1990,9 @@ static int nfs_rename(struct inode *old_dir, struct dentry *old_dentry, 
		}

	}



	nfs_inode_return_delegation(old_inode);

	NFS_PROTO(old_inode)->return_delegation(old_inode);

	if (new_inode != NULL)

		nfs_inode_return_delegation(new_inode);

		NFS_PROTO(new_inode)->return_delegation(new_inode);



	error = NFS_PROTO(old_dir)->rename(old_dir, &old_dentry->d_name,

					   new_dir, &new_dentry->d_name);

fs/nfs/inode.c

+1 −1
Original line number Diff line number Diff line
@@ -430,7 +430,7 @@ nfs_setattr(struct dentry *dentry, struct iattr *attr) 
	 * Return any delegations if we're going to change ACLs

	 */

	if ((attr->ia_valid & (ATTR_MODE|ATTR_UID|ATTR_GID)) != 0)

		nfs_inode_return_delegation(inode);

		NFS_PROTO(inode)->return_delegation(inode);

	error = NFS_PROTO(inode)->setattr(dentry, fattr, attr);

	if (error == 0)

		nfs_refresh_inode(inode, fattr);

fs/nfs/nfs3proc.c

+7 −0
Original line number Diff line number Diff line
@@ -882,6 +882,12 @@ static int nfs3_have_delegation(struct inode *inode, fmode_t flags) 
	return 0;

}



static int nfs3_return_delegation(struct inode *inode)

{

	nfs_wb_all(inode);

	return 0;

}



const struct nfs_rpc_ops nfs_v3_clientops = {

	.version	= 3,			/* protocol version */

	.dentry_ops	= &nfs_dentry_operations,
@@ -927,5 +933,6 @@ const struct nfs_rpc_ops nfs_v3_clientops = { 
	.clear_acl_cache = nfs3_forget_cached_acls,

	.close_context	= nfs_close_context,

	.have_delegation = nfs3_have_delegation,

	.return_delegation = nfs3_return_delegation,

	.init_client	= nfs_init_client,

};