summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorSage Weil <sage@newdream.net>2011-05-24 13:06:14 -0700
committerAl Viro <viro@zeniv.linux.org.uk>2011-05-26 07:26:53 -0400
commit051e8f0ee23c9ca963e2a0208153c6cd475f05fb (patch)
treea6fe507530abb5b134f20d1929aaf9fa85311f16 /fs
parent51892bbb57e87854c27c105317797823f8891e68 (diff)
downloadlinux-3.10-051e8f0ee23c9ca963e2a0208153c6cd475f05fb.tar.gz
linux-3.10-051e8f0ee23c9ca963e2a0208153c6cd475f05fb.tar.bz2
linux-3.10-051e8f0ee23c9ca963e2a0208153c6cd475f05fb.zip
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>
Diffstat (limited to 'fs')
-rw-r--r--fs/ceph/dir.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/fs/ceph/dir.c b/fs/ceph/dir.c
index 377b9640423..1a867a3601a 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 ||