block: take offset into account in blk_bvec_map_sg again
PATCH 1/1 block: take offset into account in blk_bvec_map_sg again
The rebase of commit 09595e0c9d65 ("block: pass a phys_addr_t to get_max_segment_size") lost adding the total to to the offset in blk_bvec_map_sg. Add it back.
--- block/blk-merge.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
block/blk-merge.c +2 -2
@@ -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;/*
Signature · 1 line
2.43.0
Quoted 5 lines · Christoph Hellwig
The rebase of commit
09595e0c9d65("block: pass aphys_addr_ttoget_max_segment_size") lost adding the total to to the offset inblk_bvec_map_sg. Add it back.
Applied, thanks!
[1/1] block: take offset into account in blk_bvec_map_sg again
commit: 61353a63a22890f2c642232ae1ab4a2e02e6a27c
Best regards,
Signature · 1 line
Jens Axboe
Quoted 8 lines · Christoph Hellwig
The rebase of commit
09595e0c9d65("block: pass aphys_addr_ttoget_max_segment_size") lost adding the total to to the offset inblk_bvec_map_sg. Add it back.Fixes 09595e0c9d65 ("block: pass a phys_addr_t to get_max_segment_size")Reported-by Yi Zhang <[email protected]>Reported-by Chaitanya Kulkarni <[email protected]>Signed-off-by Christoph Hellwig <[email protected]>
Thanks, that fixes booting landisk!
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]
In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds