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

!11316 block: fix pin count management when merging same-page segments 

Merge Pull Request from: @ci-robot 
 
PR sync from: Yifan Qiao <qiaoyifan4@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/6F6P77A7BTQYO2UWA2TKJ67PKB2RZHRA/ 
 
https://gitee.com/src-openeuler/kernel/issues/IANSAC 
 
Link:https://gitee.com/openeuler/kernel/pulls/11316

 

Reviewed-by: default avatarYu Kuai <yukuai3@huawei.com>
Reviewed-by: default avatarYang Yingliang <yangyingliang@huawei.com>
Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
parents 6827f6e2 d2190452

block/blk-map.c

+3 −4
Original line number Diff line number Diff line
@@ -283,12 +283,11 @@ static int bio_map_user_iov(struct request *rq, struct iov_iter *iter, 
					n = bytes;



				if (!bio_add_hw_page(rq->q, bio, page, n, offs,

						     max_sectors, &same_page)) {

					if (same_page)

						put_page(page);

						     max_sectors, &same_page))

					break;

				}



				if (same_page)

					put_page(page);

				added += n;

				bytes -= n;

				offs = 0;