diff options
| author | Christoph Hellwig <hch@tuxera.com> | 2010-10-01 09:12:08 +0200 |
|---|---|---|
| committer | Christoph Hellwig <hch@lst.de> | 2010-10-01 09:12:08 +0200 |
| commit | 40de9a7cebc4e0b23cd6863c84c2279f0ccadebb (patch) | |
| tree | ed927fe25b269fbe3f5afebd3136d6ac0770fee6 /fs/hfsplus/dir.c | |
| parent | hfsplus: convert tree_lock to mutex (diff) | |
| download | linux-40de9a7cebc4e0b23cd6863c84c2279f0ccadebb.tar.xz linux-40de9a7cebc4e0b23cd6863c84c2279f0ccadebb.zip | |
hfsplus: fix rename over directories
When renaming over a directory we need to use hfsplus_rmdir instead of
hfsplus_unlink to evict the victim. This makes sure we properly error out
on non-empty directory as required by Posix (BZ #16571), and it also makes
sure we do the right thing in case i_nlink will every be set correctly for
directories on hfsplus.
Reported-by: Vlado Plaga <rechner@vlado-do.de>
Signed-off-by: Christoph Hellwig <hch@tuxera.com>
Diffstat (limited to 'fs/hfsplus/dir.c')
| -rw-r--r-- | fs/hfsplus/dir.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/fs/hfsplus/dir.c b/fs/hfsplus/dir.c index 93fa45cc4810..33aab211695a 100644 --- a/fs/hfsplus/dir.c +++ b/fs/hfsplus/dir.c @@ -452,7 +452,10 @@ static int hfsplus_rename(struct inode *old_dir, struct dentry *old_dentry, /* Unlink destination if it already exists */ if (new_dentry->d_inode) { - res = hfsplus_unlink(new_dir, new_dentry); + if (S_ISDIR(new_dentry->d_inode->i_mode)) + res = hfsplus_rmdir(new_dir, new_dentry); + else + res = hfsplus_unlink(new_dir, new_dentry); if (res) return res; } |