Unverified Commit 2804c510 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!3748 jffs2: move jffs2_init_inode_info() just after allocating inode 

Merge Pull Request from: @ci-robot 
 
PR sync from: ZhaoLong Wang <wangzhaolong1@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/RVEPDIXKO3LBBLZWWTIP6DQGEJMDKYTP/ 
 
https://gitee.com/openeuler/kernel/issues/I8TC11 
 
Link:https://gitee.com/openeuler/kernel/pulls/3748

 

Reviewed-by: default avatarzhangyi (F) <yi.zhang@huawei.com>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parents b71995b9 30c97ad1

fs/jffs2/fs.c

+0 −2
Original line number Diff line number Diff line
@@ -271,7 +271,6 @@ struct inode *jffs2_iget(struct super_block *sb, unsigned long ino) 
	f = JFFS2_INODE_INFO(inode);

	c = JFFS2_SB_INFO(inode->i_sb);



	jffs2_init_inode_info(f);

	mutex_lock(&f->sem);



	ret = jffs2_do_read_inode(c, f, inode->i_ino, &latest_node);
@@ -439,7 +438,6 @@ struct inode *jffs2_new_inode (struct inode *dir_i, umode_t mode, struct jffs2_r 
		return ERR_PTR(-ENOMEM);



	f = JFFS2_INODE_INFO(inode);

	jffs2_init_inode_info(f);

	mutex_lock(&f->sem);



	memset(ri, 0, sizeof(*ri));

fs/jffs2/super.c

+2 −0
Original line number Diff line number Diff line
@@ -42,6 +42,8 @@ static struct inode *jffs2_alloc_inode(struct super_block *sb) 
	f = alloc_inode_sb(sb, jffs2_inode_cachep, GFP_KERNEL);

	if (!f)

		return NULL;



	jffs2_init_inode_info(f);

	return &f->vfs_inode;

}