summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSage Weil <sage@newdream.net>2011-05-24 22:06:22 +0200
committerAl Viro <viro@zeniv.linux.org.uk>2011-05-26 13:26:59 +0200
commitb6ff24a333267a6810e28ee5b9fc539d149c52f0 (patch)
tree10385e729ad81e9eeab2909cb64e99e73cb42c4c
parentocfs2: remove unnecessary dentry_unhash on rmdir/rename_dir (diff)
downloadlinux-b6ff24a333267a6810e28ee5b9fc539d149c52f0.tar.xz
linux-b6ff24a333267a6810e28ee5b9fc539d149c52f0.zip
cifs: remove unnecessary dentry_unhash on rmdir/rename_dir
Cifs has no problems with lingering references to unlinked directory inodes. CC: Steve French <sfrench@samba.org> CC: linux-cifs@vger.kernel.org Signed-off-by: Sage Weil <sage@newdream.net> Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
-rw-r--r--fs/cifs/inode.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/fs/cifs/inode.c b/fs/cifs/inode.c
index 18546b75f384..8852470b4fbb 100644
--- a/fs/cifs/inode.c
+++ b/fs/cifs/inode.c
@@ -1461,8 +1461,6 @@ int cifs_rmdir(struct inode *inode, struct dentry *direntry)
cFYI(1, "cifs_rmdir, inode = 0x%p", inode);
- dentry_unhash(direntry);
-
xid = GetXid();
full_path = build_path_from_dentry(direntry);
@@ -1571,9 +1569,6 @@ int cifs_rename(struct inode *source_dir, struct dentry *source_dentry,
FILE_UNIX_BASIC_INFO *info_buf_target;
int xid, rc, tmprc;
- if (target_dentry->d_inode && S_ISDIR(target_dentry->d_inode->i_mode))
- dentry_unhash(target_dentry);
-
cifs_sb = CIFS_SB(source_dir->i_sb);
tlink = cifs_sb_tlink(cifs_sb);
if (IS_ERR(tlink))