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

!5696 NFS: Fix an Oopsable condition in __nfs_pageio_add_request() 

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

 

Reviewed-by: default avatarLiu YongQiang <liuyongqiang13@huawei.com>
Signed-off-by: default avatarZhang Changzhong <zhangchangzhong@huawei.com>
parents 9268ff82 b446fb35

fs/nfs/pagelist.c

+6 −4
Original line number Diff line number Diff line
@@ -964,15 +964,17 @@ static int nfs_pageio_do_add_request(struct nfs_pageio_descriptor *desc, 


	struct nfs_page *prev = NULL;



	if (mirror->pg_count != 0) {

		prev = nfs_list_entry(mirror->pg_list.prev);

	} else {

	if (list_empty(&mirror->pg_list)) {

		if (desc->pg_ops->pg_init)

			desc->pg_ops->pg_init(desc, req);

		if (desc->pg_error < 0)

			return 0;

		mirror->pg_base = req->wb_pgbase;

	}

		mirror->pg_count = 0;

		mirror->pg_recoalesce = 0;

	} else

		prev = nfs_list_entry(mirror->pg_list.prev);



	if (!nfs_can_coalesce_requests(prev, req, desc))

		return 0;

	nfs_list_move_request(req, &mirror->pg_list);