summaryrefslogtreecommitdiffstats
path: root/fs/hpfs
diff options
context:
space:
mode:
authorSage Weil <sage@newdream.net>2011-05-24 13:06:07 -0700
committerAl Viro <viro@zeniv.linux.org.uk>2011-05-26 07:26:48 -0400
commite4eaac06bcccb2a70bca6a2de9871882dce2aa14 (patch)
treeca6736d96294cd6e65a1c3055718bfd5adc7336e /fs/hpfs
parent79bf7c732b5ff75b96022ed9d29181afd3d2509c (diff)
downloadlinux-stable-e4eaac06bcccb2a70bca6a2de9871882dce2aa14.tar.gz
linux-stable-e4eaac06bcccb2a70bca6a2de9871882dce2aa14.tar.bz2
linux-stable-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/hpfs')
-rw-r--r--fs/hpfs/namei.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/fs/hpfs/namei.c b/fs/hpfs/namei.c
index b9fe158fd7ba..d3db95f51a4e 100644
--- a/fs/hpfs/namei.c
+++ b/fs/hpfs/namei.c
@@ -561,6 +561,10 @@ static int hpfs_rename(struct inode *old_dir, struct dentry *old_dentry,
struct buffer_head *bh;
struct fnode *fnode;
int err;
+
+ if (new_inode && S_ISDIR(new_inode->i_mode))
+ dentry_unhash(new_dentry);
+
if ((err = hpfs_chk_name(new_name, &new_len))) return err;
err = 0;
hpfs_adjust_length(old_name, &old_len);