Message ID | 1417443907-25150-1-git-send-email-chenjie6@huawei.com |
---|---|
State | Not Applicable |
Delegated to: | David Woodhouse |
Headers | show |
diff --git a/fs/jffs2/dir.c b/fs/jffs2/dir.c index 9385560..feb0213 100644 --- a/fs/jffs2/dir.c +++ b/fs/jffs2/dir.c @@ -846,7 +846,8 @@ static int jffs2_rename (struct inode *old_dir_i, struct dentry *old_dentry, pr_notice("%s(): Link succeeded, unlink failed (err %d). You now have a hard link\n", __func__, ret); /* Might as well let the VFS know */ - d_instantiate(new_dentry, old_dentry->d_inode); + if (list_empty(&new_dentry->d_alias)) + d_instantiate(new_dentry, old_dentry->d_inode); ihold(old_dentry->d_inode); new_dir_i->i_mtime = new_dir_i->i_ctime = ITIME(now); return ret;