aboutsummaryrefslogtreecommitdiff
path: root/fs/fuse/dir.c
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/fuse/dir.c
parent79bf7c732b5ff75b96022ed9d29181afd3d2509c (diff)
downloadlinux-linaro-stable-e4eaac06bcccb2a70bca6a2de9871882dce2aa14.tar.gz
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/fuse/dir.c')
-rw-r--r--fs/fuse/dir.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/fs/fuse/dir.c b/fs/fuse/dir.c
index 40d5c2ae4e73..e462a7a281bf 100644
--- a/fs/fuse/dir.c
+++ b/fs/fuse/dir.c
@@ -693,6 +693,10 @@ static int fuse_rename(struct inode *olddir, struct dentry *oldent,
struct fuse_rename_in inarg;
struct fuse_conn *fc = get_fuse_conn(olddir);
struct fuse_req *req = fuse_get_req(fc);
+
+ if (newent->d_inode && S_ISDIR(newent->d_inode->i_mode))
+ dentry_unhash(newent);
+
if (IS_ERR(req))
return PTR_ERR(req);