From: Sage Weil <sage@newdream.net>
Date: Tue, 24 May 2011 20:06:14 +0000 (-0700)
Subject: ceph: remove unnecessary dentry_unhash calls
X-Git-Tag: MMI-PSA29.97-13-9~19455^2~8
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=051e8f0ee23c9ca963e2a0208153c6cd475f05fb;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

ceph: remove unnecessary dentry_unhash calls

Ceph does not need these, and they screw up our use of the dcache as a
consistent cache.

Signed-off-by: Sage Weil <sage@newdream.net>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
---

diff --git a/fs/ceph/dir.c b/fs/ceph/dir.c
index 377b96404235..1a867a3601ae 100644
--- a/fs/ceph/dir.c
+++ b/fs/ceph/dir.c
@@ -827,9 +827,6 @@ static int ceph_unlink(struct inode *dir, struct dentry *dentry)
 	int err = -EROFS;
 	int op;
 
-	if ((dentry->d_inode->i_mode & S_IFMT) == S_IFDIR)
-		dentry_unhash(dentry);
-
 	if (ceph_snap(dir) == CEPH_SNAPDIR) {
 		/* rmdir .snap/foo is RMSNAP */
 		dout("rmsnap dir %p '%.*s' dn %p\n", dir, dentry->d_name.len,
@@ -869,9 +866,6 @@ static int ceph_rename(struct inode *old_dir, struct dentry *old_dentry,
 	struct ceph_mds_request *req;
 	int err;
 
-	if (new_dentry->d_inode && S_ISDIR(new_dentry->d_inode->i_mode))
-		dentry_unhash(new_dentry);
-
 	if (ceph_snap(old_dir) != ceph_snap(new_dir))
 		return -EXDEV;
 	if (ceph_snap(old_dir) != CEPH_NOSNAP ||