blk-mq: only attempt to merge bio if there is rq in sw queue

[mirror_ubuntu-bionic-kernel.git] / block / bio.c

diff --git a/block/bio.c b/block/bio.c
index 095da59a303cf5b13469a9b8c3386c9f42ffd985..66a7feb5414db13522c571ef67861d32d8975c4b 100644 (file)
--- a/block/bio.c
+++ b/block/bio.c
@@ -156,7 +156,7 @@ out:
 
 unsigned int bvec_nr_vecs(unsigned short idx)
 {
-       return bvec_slabs[idx].nr_vecs;
+       return bvec_slabs[--idx].nr_vecs;
 }
 
 void bvec_free(mempool_t *pool, struct bio_vec *bv, unsigned int idx)
@@ -1338,6 +1338,8 @@ struct bio *bio_copy_user_iov(struct request_queue *q,
                if (ret)
                        goto cleanup;
        } else {
+               if (bmd->is_our_pages)
+                       zero_fill_bio(bio);
                iov_iter_advance(iter, bio->bi_iter.bi_size);
        }