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>
This commit is contained in:
parent
27226104e6
commit
24e93025ee
11
fs/nfs/dir.c
11
fs/nfs/dir.c
|
@ -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;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue