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

!1147 [sync] PR-1136: gfs2: Don't deref jdesc in evict 

Merge Pull Request from: @openeuler-sync-bot 
 

Origin pull request: 
https://gitee.com/openeuler/kernel/pulls/1136 
 
PR sync from: ZhaoLong Wang <wangzhaolong1@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/ID2Q7S2KSELYENBGS2BVZCEVGEP4WKO2/ 
 
 
Link:https://gitee.com/openeuler/kernel/pulls/1147

 

Reviewed-by: default avatarzhangyi (F) <yi.zhang@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents 79f501a5 937ebe8b

fs/gfs2/super.c

+8 −0
Original line number Original line Diff line number Diff line
@@ -1412,6 +1412,14 @@ static void gfs2_evict_inode(struct inode *inode) 
	if (inode->i_nlink || sb_rdonly(sb))

	if (inode->i_nlink || sb_rdonly(sb))

		goto out;

		goto out;





	/*

	 * In case of an incomplete mount, gfs2_evict_inode() may be called for

	 * system files without having an active journal to write to.  In that

	 * case, skip the filesystem evict.

	 */

	if (!sdp->sd_jdesc)

		goto out;



	gfs2_holder_mark_uninitialized(&gh);

	gfs2_holder_mark_uninitialized(&gh);

	ret = evict_should_delete(inode, &gh);

	ret = evict_should_delete(inode, &gh);

	if (ret == SHOULD_DEFER_EVICTION)

	if (ret == SHOULD_DEFER_EVICTION)