Skip to content

Commit 83215e8

Browse files
committed
Merge branch 'for-6.11/block' into for-next
* for-6.11/block: block: take offset into account in blk_bvec_map_sg again
2 parents dcee179 + 61353a6 commit 83215e8

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

block/blk-merge.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -491,8 +491,8 @@ static unsigned blk_bvec_map_sg(struct request_queue *q,
491491

492492
while (nbytes > 0) {
493493
unsigned offset = bvec->bv_offset + total;
494-
unsigned len = get_max_segment_size(&q->limits, bvec_phys(bvec),
495-
nbytes);
494+
unsigned len = get_max_segment_size(&q->limits,
495+
bvec_phys(bvec) + total, nbytes);
496496
struct page *page = bvec->bv_page;
497497

498498
/*

0 commit comments

Comments
 (0)