aboutsummaryrefslogtreecommitdiffstats
path: root/fs/libfs.c
diff options
context:
space:
mode:
authorSage Weil <sage@newdream.net>2011-05-24 16:06:07 -0400
committerAl Viro <viro@zeniv.linux.org.uk>2011-05-26 07:26:48 -0400
commite4eaac06bcccb2a70bca6a2de9871882dce2aa14 (patch)
treeca6736d96294cd6e65a1c3055718bfd5adc7336e /fs/libfs.c
parent79bf7c732b5ff75b96022ed9d29181afd3d2509c (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/libfs.c')
-rw-r--r--fs/libfs.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/fs/libfs.c b/fs/libfs.c
index 1e2ba5a96b10..91a3710e0fe5 100644
--- a/fs/libfs.c
+++ b/fs/libfs.c
@@ -325,6 +325,9 @@ int simple_rename(struct inode *old_dir, struct dentry *old_dentry,
325 struct inode *inode = old_dentry->d_inode; 325 struct inode *inode = old_dentry->d_inode;
326 int they_are_dirs = S_ISDIR(old_dentry->d_inode->i_mode); 326 int they_are_dirs = S_ISDIR(old_dentry->d_inode->i_mode);
327 327
328 if (new_dentry->d_inode && S_ISDIR(new_dentry->d_inode->i_mode))
329 dentry_unhash(new_dentry);
330
328 if (!simple_empty(new_dentry)) 331 if (!simple_empty(new_dentry))
329 return -ENOTEMPTY; 332 return -ENOTEMPTY;
330 333