diff options
| author | Sage Weil <sage@newdream.net> | 2011-05-24 16:06:07 -0400 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2011-05-26 07:26:48 -0400 |
| commit | e4eaac06bcccb2a70bca6a2de9871882dce2aa14 (patch) | |
| tree | ca6736d96294cd6e65a1c3055718bfd5adc7336e /fs/jffs2 | |
| parent | 79bf7c732b5ff75b96022ed9d29181afd3d2509c (diff) | |
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/jffs2')
| -rw-r--r-- | fs/jffs2/dir.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/fs/jffs2/dir.c b/fs/jffs2/dir.c index 727d64439cd1..05f73328b28b 100644 --- a/fs/jffs2/dir.c +++ b/fs/jffs2/dir.c | |||
| @@ -786,6 +786,9 @@ static int jffs2_rename (struct inode *old_dir_i, struct dentry *old_dentry, | |||
| 786 | uint8_t type; | 786 | uint8_t type; |
| 787 | uint32_t now; | 787 | uint32_t now; |
| 788 | 788 | ||
| 789 | if (new_dentry->d_inode && S_ISDIR(new_dentry->d_inode->i_mode)) | ||
| 790 | dentry_unhash(new_dentry); | ||
| 791 | |||
| 789 | /* The VFS will check for us and prevent trying to rename a | 792 | /* The VFS will check for us and prevent trying to rename a |
| 790 | * file over a directory and vice versa, but if it's a directory, | 793 | * file over a directory and vice versa, but if it's a directory, |
| 791 | * the VFS can't check whether the victim is empty. The filesystem | 794 | * the VFS can't check whether the victim is empty. The filesystem |