Commit 24e93025 authored Dec 03, 2009 by Miklos Szeredi Committed by Trond Myklebust Dec 03, 2009

nfs: clean up sillyrenaming in nfs_rename()



The d_instantiate(new_dentry, NULL) is superfluous, the dentry is
already negative.  Rehashing this dummy dentry isn't needed either,
d_move() works fine on an unhashed target.

The re-checking for busy after a failed nfs_sillyrename() is bogus
too: new_dentry->d_count < 2 would be a bug here.

Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>

parent 27226104

fs/nfs/dir.c

+4 −7

Original line number	Diff line number	Diff line
		@@ -1611,14 +1611,11 @@ static int nfs_rename(struct inode old_dir, struct dentry old_dentry,

		/* silly-rename the existing target ... */
		err = nfs_sillyrename(new_dir, new_dentry);
		if (!err) {
		new_dentry = rehash = dentry;
		new_inode = NULL;
		/* instantiate the replacement target */
		d_instantiate(new_dentry, NULL);
		} else if (atomic_read(&new_dentry->d_count) > 1)
		/* dentry still busy? */
		if (err)
		goto out;

		new_dentry = dentry;
		new_inode = NULL;
		}
		}

Admin message