Merge branch 'for-6.11/block' into for-next

* for-6.11/block: block: take offset into account in blk_bvec_map_sg again
Rust-for-Linux · Jul 9, 2024 · 83215e8 · 83215e8
2 parents dcee179 + 61353a6
commit 83215e8
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/block/blk-merge.c b/block/blk-merge.c
@@ -491,8 +491,8 @@ static unsigned blk_bvec_map_sg(struct request_queue *q,
 
 	while (nbytes > 0) {
 		unsigned offset = bvec->bv_offset + total;
-		unsigned len = get_max_segment_size(&q->limits, bvec_phys(bvec),
-			nbytes);
+		unsigned len = get_max_segment_size(&q->limits,
+				bvec_phys(bvec) + total, nbytes);
 		struct page *page = bvec->bv_page;
 
 		/*