raspi/linux
1
0
Fork 1
mirror of https://github.com/raspberrypi/linux.git synced 2025-12-07 10:29:52 +00:00
Code Issues Projects Releases Wiki Activity

jffs2: reduce the breakage on recovery from halfway failed rename()

Browse Source 
[ Upstream commit f93812846f ]

d_instantiate(new_dentry, old_inode) is absolutely wrong thing to
do - it will oops if new_dentry used to be positive, for starters.
What we need is d_invalidate() the target and be done with that.

Cc: stable@vger.kernel.org # v3.18+
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
This commit is contained in:
Al Viro
2016-03-07 23:07:10 -05:00
committed by Sasha Levin
parent 906e5a6e6e
commit c62aadae23
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
fs/jffs2/dir.c
View File

@@ -845,9 +845,14 @@ 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", pr_notice("%s(): Link succeeded, unlink failed (err %d). You now have a hard link\n",
__func__, ret); __func__, ret);
/* Might as well let the VFS know */ /*
d_instantiate(new_dentry, d_inode(old_dentry)); * We can't keep the target in dcache after that.
ihold(d_inode(old_dentry)); * For one thing, we can't afford dentry aliases for directories.
* For another, if there was a victim, we _can't_ set new inode
* for that sucker and we have to trigger mount eviction - the
* caller won't do it on its own since we are returning an error.
*/
d_invalidate(new_dentry);
new_dir_i->i_mtime = new_dir_i->i_ctime = ITIME(now); new_dir_i->i_mtime = new_dir_i->i_ctime = ITIME(now);
return ret; return ret;
} }