Commit f414ca64 authored Mar 12, 2016 by Linus Torvalds

linux-block

Pull block merge fix from Jens Axboe.

This fixes the block segment counting bug and resulting sg overrun
reported by Kent Overstreet, introduced with the last block pull.

* 'for-linus' of git://git.kernel.dk/linux-block:
  block: don't optimize for non-cloned bio in bio_get_last_bvec()

parents 2f51c820 90d0f0f1

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;