diff options
| author | Sage Weil <sage@newdream.net> | 2011-05-24 13:06:06 -0700 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2011-05-26 07:26:47 -0400 |
| commit | 79bf7c732b5ff75b96022ed9d29181afd3d2509c (patch) | |
| tree | 74b8cc690f9a37fff02d0685464e1c695a25ef94 /fs/omfs/dir.c | |
| parent | 64252c75a2196a0cf1e0d3777143ecfe0e3ae650 (diff) | |
| download | op-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/omfs/dir.c')
| -rw-r--r-- | fs/omfs/dir.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/fs/omfs/dir.c b/fs/omfs/dir.c index de4ff29..95ef443 100644 --- a/fs/omfs/dir.c +++ b/fs/omfs/dir.c @@ -240,8 +240,12 @@ static int omfs_remove(struct inode *dir, struct dentry *dentry) struct inode *inode = dentry->d_inode; int ret; - if (S_ISDIR(inode->i_mode) && !omfs_dir_is_empty(inode)) - return -ENOTEMPTY; + + if (S_ISDIR(inode->i_mode)) { + dentry_unhash(dentry); + if (!omfs_dir_is_empty(inode)) + return -ENOTEMPTY; + } ret = omfs_delete_entry(dentry); if (ret) |
