diff options
| author | Sage Weil <sage@newdream.net> | 2011-05-24 13:06:07 -0700 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2011-05-26 07:26:48 -0400 |
| commit | e4eaac06bcccb2a70bca6a2de9871882dce2aa14 (patch) | |
| tree | ca6736d96294cd6e65a1c3055718bfd5adc7336e /fs/hfsplus/dir.c | |
| parent | 79bf7c732b5ff75b96022ed9d29181afd3d2509c (diff) | |
| download | blackbird-obmc-linux-e4eaac06bcccb2a70bca6a2de9871882dce2aa14.tar.gz blackbird-obmc-linux-e4eaac06bcccb2a70bca6a2de9871882dce2aa14.zip | |
vfs: push dentry_unhash on rename_dir into file systems
Only a few file systems need this. Start by pushing it down into each
rename method (except gfs2 and xfs) so that it can be dealt with on a
per-fs basis.
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/hfsplus/dir.c')
| -rw-r--r-- | fs/hfsplus/dir.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/fs/hfsplus/dir.c b/fs/hfsplus/dir.c index 23451a955aa0..b28835091dd0 100644 --- a/fs/hfsplus/dir.c +++ b/fs/hfsplus/dir.c @@ -469,10 +469,12 @@ static int hfsplus_rename(struct inode *old_dir, struct dentry *old_dentry, /* Unlink destination if it already exists */ if (new_dentry->d_inode) { - if (S_ISDIR(new_dentry->d_inode->i_mode)) + if (S_ISDIR(new_dentry->d_inode->i_mode)) { + dentry_unhash(new_dentry); res = hfsplus_rmdir(new_dir, new_dentry); - else + } else { res = hfsplus_unlink(new_dir, new_dentry); + } if (res) return res; } |
