From: Al Viro Date: Thu, 21 Jul 2011 19:57:47 +0000 (-0400) Subject: jffs2: fix IN_DELETE_SELF on overwriting rename() killing a directory X-Git-Tag: MMI-PSA29.97-13-9~18895^2~2 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=22ba747f660c0acd14761628c24aa972d18058a0;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git jffs2: fix IN_DELETE_SELF on overwriting rename() killing a directory We don't generate IN_DELETE_SELF on victim of overwriting rename() if it happens to be a directory. Trivially fixed by doing to ->i_nlink what we do ->pino_nlink a couple of lines later in jffs2_rename(). Signed-off-by: Al Viro --- diff --git a/fs/jffs2/dir.c b/fs/jffs2/dir.c index 8f40ce4f1777..5f243cd63afc 100644 --- a/fs/jffs2/dir.c +++ b/fs/jffs2/dir.c @@ -820,7 +820,10 @@ static int jffs2_rename (struct inode *old_dir_i, struct dentry *old_dentry, if (victim_f) { /* There was a victim. Kill it off nicely */ - drop_nlink(new_dentry->d_inode); + if (S_ISDIR(new_dentry->d_inode->i_mode)) + clear_nlink(new_dentry->d_inode); + else + drop_nlink(new_dentry->d_inode); /* Don't oops if the victim was a dirent pointing to an inode which didn't exist. */ if (victim_f->inocache) {