summaryrefslogtreecommitdiffstats
path: root/fs/autofs4/root.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/autofs4/root.c
parent64252c75a2196a0cf1e0d3777143ecfe0e3ae650 (diff)
downloadlinux-79bf7c732b5ff75b96022ed9d29181afd3d2509c.tar.gz
linux-79bf7c732b5ff75b96022ed9d29181afd3d2509c.tar.bz2
linux-79bf7c732b5ff75b96022ed9d29181afd3d2509c.zip
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/autofs4/root.c')
-rw-r--r--fs/autofs4/root.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/autofs4/root.c b/fs/autofs4/root.c
index f55ae23b137e..87d95a8cddbc 100644
--- a/fs/autofs4/root.c
+++ b/fs/autofs4/root.c
@@ -583,6 +583,8 @@ static int autofs4_dir_unlink(struct inode *dir, struct dentry *dentry)
if (!autofs4_oz_mode(sbi) && !capable(CAP_SYS_ADMIN))
return -EACCES;
+ dentry_unhash(dentry);
+
if (atomic_dec_and_test(&ino->count)) {
p_ino = autofs4_dentry_ino(dentry->d_parent);
if (p_ino && dentry->d_parent != dentry)