summaryrefslogtreecommitdiffstats
path: root/fs/ocfs2/namei.c
diff options
context:
space:
mode:
authorSage Weil <sage@newdream.net>2011-05-24 13:06:06 -0700
committerAl Viro <viro@zeniv.linux.org.uk>2011-05-26 07:26:47 -0400
commit79bf7c732b5ff75b96022ed9d29181afd3d2509c (patch)
tree74b8cc690f9a37fff02d0685464e1c695a25ef94 /fs/ocfs2/namei.c
parent64252c75a2196a0cf1e0d3777143ecfe0e3ae650 (diff)
downloadop-kernel-dev-79bf7c732b5ff75b96022ed9d29181afd3d2509c.zip
op-kernel-dev-79bf7c732b5ff75b96022ed9d29181afd3d2509c.tar.gz
vfs: push dentry_unhash on rmdir into file systems
Only a few file systems need this. Start by pushing it down into each fs rmdir method (except gfs2 and xfs) so it can be dealt with on a per-fs basis. This does not change behavior for any in-tree file systems. Acked-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Sage Weil <sage@newdream.net> Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/ocfs2/namei.c')
-rw-r--r--fs/ocfs2/namei.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/fs/ocfs2/namei.c b/fs/ocfs2/namei.c
index e5d738c..b017ebb 100644
--- a/fs/ocfs2/namei.c
+++ b/fs/ocfs2/namei.c
@@ -810,6 +810,9 @@ static int ocfs2_unlink(struct inode *dir,
(unsigned long long)OCFS2_I(dir)->ip_blkno,
(unsigned long long)OCFS2_I(inode)->ip_blkno);
+ if (S_ISDIR(inode->i_mode))
+ dentry_unhash(dentry);
+
dquot_initialize(dir);
BUG_ON(dentry->d_parent->d_inode != dir);
OpenPOWER on IntegriCloud