From aff1d61e5b7025df0760ff5e22f2e48aa3a774a6 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Tue, 24 May 2011 13:06:22 -0700 Subject: [PATCH] --- yaml --- r: 251702 b: refs/heads/master c: b6ff24a333267a6810e28ee5b9fc539d149c52f0 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/cifs/inode.c | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 518424a53d11..b61e09f0acf6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7ca57363880c2b321ff64d34a82ae4af86ee52d5 +refs/heads/master: b6ff24a333267a6810e28ee5b9fc539d149c52f0 diff --git a/trunk/fs/cifs/inode.c b/trunk/fs/cifs/inode.c index 18546b75f384..8852470b4fbb 100644 --- a/trunk/fs/cifs/inode.c +++ b/trunk/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))