summaryrefslogtreecommitdiffstats
path: root/fs/logfs
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/logfs
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/logfs')
-rw-r--r--fs/logfs/dir.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/fs/logfs/dir.c b/fs/logfs/dir.c
index 2b32734cd31a..f34c9cde9e94 100644
--- a/fs/logfs/dir.c
+++ b/fs/logfs/dir.c
@@ -624,6 +624,9 @@ static int logfs_rename_cross(struct inode *old_dir, struct dentry *old_dentry,
loff_t pos;
int err;
+ if (new_dentry->d_inode && S_ISDIR(new_dentry->d_inode->i_mode))
+ dentry_unhash(new_dentry);
+
/* 1. locate source dd */
err = logfs_get_dd(old_dir, old_dentry, &dd, &pos);
if (err)