diff options
author | Sage Weil <sage@newdream.net> | 2011-05-24 22:06:06 +0200 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2011-05-26 13:26:47 +0200 |
commit | 79bf7c732b5ff75b96022ed9d29181afd3d2509c (patch) | |
tree | 74b8cc690f9a37fff02d0685464e1c695a25ef94 /fs/hfs | |
parent | vfs: remove dget() from dentry_unhash() (diff) | |
download | linux-79bf7c732b5ff75b96022ed9d29181afd3d2509c.tar.xz 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/hfs')
-rw-r--r-- | fs/hfs/dir.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/fs/hfs/dir.c b/fs/hfs/dir.c index b4d70b13be92..616cfe02b601 100644 --- a/fs/hfs/dir.c +++ b/fs/hfs/dir.c @@ -253,6 +253,9 @@ static int hfs_remove(struct inode *dir, struct dentry *dentry) struct inode *inode = dentry->d_inode; int res; + if (S_ISDIR(inode->i_mode)) + dentry_unhash(dentry); + if (S_ISDIR(inode->i_mode) && inode->i_size != 2) return -ENOTEMPTY; res = hfs_cat_delete(inode->i_ino, dir, &dentry->d_name); |