author: Sage Weil <sage@newdream.net> 2011-05-24 13:06:07 -0700
committer: Al Viro <viro@zeniv.linux.org.uk> 2011-05-26 07:26:48 -0400
commit: e4eaac06bcccb2a70bca6a2de9871882dce2aa14
parent: 79bf7c732b5ff75b96022ed9d29181afd3d2509c
Commit Summary:
Diffstat:
1 file changed, 3 insertions, 0 deletions
diff --git a/fs/sysv/namei.c b/fs/sysv/namei.c
index fac64ac31869..e2cc6756f3b1 100644
--- a/fs/sysv/namei.c
+++ b/fs/sysv/namei.c
@@ -224,6 +224,9 @@ static int sysv_rename(struct inode * old_dir, struct dentry * old_dentry,
struct sysv_dir_entry * old_de;
int err = -ENOENT;
+ if (new_inode && S_ISDIR(new_inode->i_mode))
+ dentry_unhash(new_dentry);
+
old_de = sysv_find_entry(old_dentry, &old_page);
if (!old_de)
goto out;