]> git.baikalelectronics.ru Git - kernel.git/commit
block: don't use bio->bi_vcnt to figure out segment number
authorMing Lei <ming.lei@redhat.com>
Fri, 15 Feb 2019 11:13:08 +0000 (19:13 +0800)
committerJens Axboe <axboe@kernel.dk>
Fri, 15 Feb 2019 15:40:10 +0000 (08:40 -0700)
commitcbbb48568cc1cfbbe79ad6827b8879a540040726
tree7746511bdf2d0d19f2e4f651b3591d84a6d3b760
parentdd953578263070850bd821b9ce990bd4741c8141
block: don't use bio->bi_vcnt to figure out segment number

It is wrong to use bio->bi_vcnt to figure out how many segments
there are in the bio even though CLONED flag isn't set on this bio,
because this bio may be splitted or advanced.

So always use bio_segments() in blk_recount_segments(), and it shouldn't
cause any performance loss now because the physical segment number is figured
out in blk_queue_split() and BIO_SEG_VALID is set meantime since
96a3159e256248b639ae ("block: setup bi_phys_segments after splitting").

Reviewed-by: Omar Sandoval <osandov@fb.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Fixes: 489404f7d2ad ("blk-merge: recaculate segment if it isn't less than max segments")
Signed-off-by: Ming Lei <ming.lei@redhat.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
block/blk-merge.c