diff options
author | Mark Brown <broonie@kernel.org> | 2016-03-18 09:48:58 +0000 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2016-03-18 09:48:58 +0000 |
commit | 917a9133a6b3c6cc2b6b5649d28c617a4ccac3e6 (patch) | |
tree | 2d7ae3b1ae72fbad4f54eb39a651a2e51a79611e /include/linux/bio.h | |
parent | ddbcfcba5fdc56f30e4d02c3bac8cf965502cece (diff) | |
parent | 6d0b88c88bf58bfd89ffbdaa97b03617fe8c6478 (diff) |
Merge remote-tracking branch 'lsk/linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4lsk-v4.4-16.03
Diffstat (limited to 'include/linux/bio.h')
-rw-r--r-- | include/linux/bio.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/include/linux/bio.h b/include/linux/bio.h index 79cfaeef1b0d..fbe47bc700bd 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; |