Commit 90d0f0f1 authored Mar 12, 2016 by Ming Lei Committed by Jens Axboe Mar 12, 2016

block: don't optimize for non-cloned bio in bio_get_last_bvec()



For !BIO_CLONED bio, we can use .bi_vcnt safely, but it
doesn't mean we can just simply return .bi_io_vec[.bi_vcnt - 1]
because the start postion may have been moved in the middle of
the bvec, such as splitting in the middle of bvec.

Fixes: 7bcd79ac(block: bio: introduce helpers to get the 1st and last bvec)
Cc: stable@vger.kernel.org
Reported-by: Kent Overstreet <kent.overstreet@gmail.com>
Signed-off-by: Ming Lei <ming.lei@canonical.com>
Signed-off-by: Jens Axboe <axboe@fb.com>

parent f2c12421

include/linux/bio.h

+0 −5

Original line number	Diff line number	Diff line
		@@ -320,11 +320,6 @@ static inline void bio_get_last_bvec(struct bio bio, struct bio_vec bv)
		struct bvec_iter iter = bio->bi_iter;
		int idx;

		if (!bio_flagged(bio, BIO_CLONED)) {
		*bv = bio->bi_io_vec[bio->bi_vcnt - 1];
		return;
		}

		if (unlikely(!bio_multiple_segments(bio))) {
		*bv = bio_iovec(bio);
		return;