Merge branch 'for-linus' of git://git.kernel.dk/linux-block

f414ca64 · Linus Torvalds <[email protected]> · 2016-03-12 20:18:54 -08:00

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()

Commit: f414ca64be4b36c30deb5b5fa25c5a8ff42ea56b
Parents: 2f51c820 · 90d0f0f1

Merge commit. Changes below are compared with the first parent: 2f51c820.

Changes

1 files changed · +0 −5

File	Status	Add	Del	Content
include/linux/bio.h	modified	+0	−5	View file

include/linux/bio.h

View file

diff --git a/include/linux/bio.h b/include/linux/bio.h
index cb68888..88bc64f 100644
--- a/include/linux/bio.h
+++ b/include/linux/bio.h
@@ -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;