|
@@ -1748,8 +1748,6 @@ static int nfs_rmdir(struct inode *dir, struct dentry *dentry)
|
|
|
dfprintk(VFS, "NFS: rmdir(%s/%ld), %s\n",
|
|
|
dir->i_sb->s_id, dir->i_ino, dentry->d_name.name);
|
|
|
|
|
|
- dentry_unhash(dentry);
|
|
|
-
|
|
|
error = NFS_PROTO(dir)->rmdir(dir, &dentry->d_name);
|
|
|
/* Ensure the VFS deletes this inode */
|
|
|
if (error == 0 && dentry->d_inode != NULL)
|
|
@@ -1959,9 +1957,6 @@ static int nfs_rename(struct inode *old_dir, struct dentry *old_dentry,
|
|
|
new_dentry->d_parent->d_name.name, new_dentry->d_name.name,
|
|
|
new_dentry->d_count);
|
|
|
|
|
|
- if (new_inode && S_ISDIR(new_inode->i_mode))
|
|
|
- dentry_unhash(new_dentry);
|
|
|
-
|
|
|
/*
|
|
|
* For non-directories, check whether the target is busy and if so,
|
|
|
* make a copy of the dentry and then do a silly-rename. If the
|