Commit 9f768272 authored Mar 20, 2018 by Trond Myklebust Committed by Anna Schumaker Apr 10, 2018

NFS: Move the delegation return down into nfs4_proc_link()



Move the delegation return out of generic code.

Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>

parent f5086242

fs/nfs/dir.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -1932,8 +1932,6 @@ nfs_link(struct dentry old_dentry, struct inode dir, struct dentry *dentry)
		old_dentry, dentry);

		trace_nfs_link_enter(inode, dir, dentry);
		NFS_PROTO(inode)->return_delegation(inode);

		d_drop(dentry);
		error = NFS_PROTO(dir)->link(inode, dir, &dentry->d_name);
		if (error == 0) {

fs/nfs/nfs4proc.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -4318,6 +4318,8 @@ static int _nfs4_proc_link(struct inode inode, struct inode dir, const struct
		}
		arg.bitmask = nfs4_bitmask(server, res.label);

		nfs4_inode_return_delegation(inode);

		status = nfs4_call_sync(server->client, server, &msg, &arg.seq_args, &res.seq_res, 1);
		if (!status) {
		update_changeattr(dir, &res.cinfo, res.fattr->time_start);