]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit730178d6c857b8aab5675bd4f8db1c2a8a000612
tree0a48a4b1c8662900ba31f7dd51e51482a7251831
parent3b6b4b5f087e59758f96d73d9f0a2756fac91e8f
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: b73a8d5677b9 ("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