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

Commit d4ea7e3c authored by Benjamin Coddington's avatar Benjamin Coddington Committed by Anna Schumaker
Browse files

NFS: Fix old dentry rehash after move 



Now that nfs_rename()'s d_move has moved within the RPC task's rpc_call_done
callback, rehashing new_dentry will actually rehash the old dentry's name
in nfs_rename().  d_move() is going to rehash the new dentry for us anyway,
so doing it again here is unnecessary.

Reported-by: default avatarChuck Lever <chuck.lever@oracle.com>
Fixes: 920b4530 ("NFS: nfs_rename() handle -ERESTARTSYS dentry left behind")
Signed-off-by: default avatarBenjamin Coddington <bcodding@redhat.com>
Tested-by: default avatarChuck Lever <chuck.lever@oracle.com>
Signed-off-by: default avatarAnna Schumaker <Anna.Schumaker@Netapp.com>
parent da066f3f

fs/nfs/dir.c

+2 −7
Original line number Diff line number Diff line
@@ -2055,7 +2055,7 @@ int nfs_rename(struct inode *old_dir, struct dentry *old_dentry, 
{

	struct inode *old_inode = d_inode(old_dentry);

	struct inode *new_inode = d_inode(new_dentry);

	struct dentry *dentry = NULL, *rehash = NULL;

	struct dentry *dentry = NULL;

	struct rpc_task *task;

	int error = -EBUSY;
@@ -2078,10 +2078,8 @@ int nfs_rename(struct inode *old_dir, struct dentry *old_dentry, 
		 * To prevent any new references to the target during the

		 * rename, we unhash the dentry in advance.

		 */

		if (!d_unhashed(new_dentry)) {

		if (!d_unhashed(new_dentry))

			d_drop(new_dentry);

			rehash = new_dentry;

		}



		if (d_count(new_dentry) > 2) {

			int err;
@@ -2098,7 +2096,6 @@ int nfs_rename(struct inode *old_dir, struct dentry *old_dentry, 
				goto out;



			new_dentry = dentry;

			rehash = NULL;

			new_inode = NULL;

		}

	}
@@ -2119,8 +2116,6 @@ int nfs_rename(struct inode *old_dir, struct dentry *old_dentry, 
		error = task->tk_status;

	rpc_put_task(task);

out:

	if (rehash)

		d_rehash(rehash);

	trace_nfs_rename_exit(old_dir, old_dentry,

			new_dir, new_dentry, error);

	/* new dentry created? */