summaryrefslogtreecommitdiff
path: root/fs/affs
diff options
context:
space:
mode:
authorSage Weil <sage@newdream.net>2011-05-25 00:06:07 +0400
committerAl Viro <viro@zeniv.linux.org.uk>2011-05-26 15:26:48 +0400
commite4eaac06bcccb2a70bca6a2de9871882dce2aa14 (patch)
treeca6736d96294cd6e65a1c3055718bfd5adc7336e /fs/affs
parent79bf7c732b5ff75b96022ed9d29181afd3d2509c (diff)
downloadlinux-e4eaac06bcccb2a70bca6a2de9871882dce2aa14.tar.xz
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/affs')
-rw-r--r--fs/affs/namei.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/fs/affs/namei.c b/fs/affs/namei.c
index d087153d5052..03330e2e390c 100644
--- a/fs/affs/namei.c
+++ b/fs/affs/namei.c
@@ -419,6 +419,9 @@ affs_rename(struct inode *old_dir, struct dentry *old_dentry,
struct buffer_head *bh = NULL;
int retval;
+ if (new_dentry->d_inode && S_ISDIR(new_dentry->d_inode->i_mode))
+ dentry_unhash(new_dentry);
+
pr_debug("AFFS: rename(old=%u,\"%*s\" to new=%u,\"%*s\")\n",
(u32)old_dir->i_ino, (int)old_dentry->d_name.len, old_dentry->d_name.name,
(u32)new_dir->i_ino, (int)new_dentry->d_name.len, new_dentry->d_name.name);