kevin/linux
1
Fork 0
Code

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

Browse Source 
There is no need to unpin the added page when adding it to the bio fails
as that is done by the loop below.  Instead we want to unpin it when adding
a single page to the bio more than once as bio_release_pages will only
unpin it once.

Fixes: d1916c86cc ("block: move same page handling from __bio_add_pc_page to the callers")
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Damien Le Moal <dlemoal@kernel.org>
Link: https://lore.kernel.org/r/20230905124731.328255-1-hch@lst.de
Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Christoph Hellwig 2023-09-05 14:47:31 +02:00 committed by Jens Axboe
parent 5a26e45edb
commit 5905afc2c7
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
block/blk-map.c
View File

@ -315,12 +315,11 @@ static int bio_map_user_iov(struct request *rq, struct iov_iter *iter,
n = bytes; n = bytes;
if (!bio_add_hw_page(rq->q, bio, page, n, offs, if (!bio_add_hw_page(rq->q, bio, page, n, offs,
max_sectors, &same_page)) { max_sectors, &same_page))
if (same_page)
bio_release_page(bio, page);
break; break;
}
if (same_page)
bio_release_page(bio, page);
bytes -= n; bytes -= n;
offs = 0; offs = 0;
} }