block: fix mismerge in bvec_advance
authorChristoph Hellwig <hch@lst.de>
Tue, 7 May 2019 06:53:35 +0000 (08:53 +0200)
committerJens Axboe <axboe@kernel.dk>
Tue, 7 May 2019 14:39:02 +0000 (08:39 -0600)
commitb8753433fc611e23e31300e1d099001a08955c88
tree0a48a4b1c8662900ba31f7dd51e51482a7251831
parent662156641bc409a28fa313fca1a755105425d278
block: fix mismerge in bvec_advance

When Jens merged my commit to only allow contiguous page structs in a
bio_vec with Ming's 5.1 fix to ensue the bvec length didn't overflow
we failed to keep the removal of the expensive nth_page calls.  This
commits adds them back as intended.

Fixes: 5c61ee2cd586 ("Merge tag 'v5.1-rc6' into for-5.2/block")
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
include/linux/bvec.h