aboutsummaryrefslogtreecommitdiffstats
path: root/fs/ext2/namei.c
diff options
context:
space:
mode:
authorSage Weil <sage@newdream.net>2011-05-24 16:06:06 -0400
committerAl Viro <viro@zeniv.linux.org.uk>2011-05-26 07:26:47 -0400
commit79bf7c732b5ff75b96022ed9d29181afd3d2509c (patch)
tree74b8cc690f9a37fff02d0685464e1c695a25ef94 /fs/ext2/namei.c
parent64252c75a2196a0cf1e0d3777143ecfe0e3ae650 (diff)
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/ext2/namei.c')
-rw-r--r--fs/ext2/namei.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/ext2/namei.c b/fs/ext2/namei.c
index ed5c5d496ee9..7a5ad9762de9 100644
--- a/fs/ext2/namei.c
+++ b/fs/ext2/namei.c
@@ -296,6 +296,8 @@ static int ext2_rmdir (struct inode * dir, struct dentry *dentry)
296 struct inode * inode = dentry->d_inode; 296 struct inode * inode = dentry->d_inode;
297 int err = -ENOTEMPTY; 297 int err = -ENOTEMPTY;
298 298
299 dentry_unhash(dentry);
300
299 if (ext2_empty_dir(inode)) { 301 if (ext2_empty_dir(inode)) {
300 err = ext2_unlink(dir, dentry); 302 err = ext2_unlink(dir, dentry);
301 if (!err) { 303 if (!err) {