Skip to content

Commit 578270b

Browse files
Ming Leiaxboe
authored andcommitted
block: fix segment split
Inside blk_bio_segment_split(), previous bvec pointer(bvprvp) always points to the iterator local variable, which is obviously wrong, so fix it by pointing to the local variable of 'bvprv'. Fixes: 5014c31(block: fix bogus compiler warnings in blk-merge.c) Cc: stable@kernel.org #4.3 Reported-by: Michael Ellerman <mpe@ellerman.id.au> Reported-by: Mark Salter <msalter@redhat.com> Tested-by: Laurent Dufour <ldufour@linux.vnet.ibm.com> Tested-by: Mark Salter <msalter@redhat.com> Signed-off-by: Ming Lei <ming.lei@canonical.com> Signed-off-by: Jens Axboe <axboe@fb.com>
1 parent b094f89 commit 578270b

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

block/blk-merge.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ static struct bio *blk_bio_segment_split(struct request_queue *q,
9898

9999
seg_size += bv.bv_len;
100100
bvprv = bv;
101-
bvprvp = &bv;
101+
bvprvp = &bvprv;
102102
sectors += bv.bv_len >> 9;
103103
continue;
104104
}
@@ -108,7 +108,7 @@ static struct bio *blk_bio_segment_split(struct request_queue *q,
108108

109109
nsegs++;
110110
bvprv = bv;
111-
bvprvp = &bv;
111+
bvprvp = &bvprv;
112112
seg_size = bv.bv_len;
113113
sectors += bv.bv_len >> 9;
114114
}

0 commit comments

Comments
 (0)