block: Silence spurious compiler warnings

Signed-off-by: Kent Overstreet <kmo@daterainc.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/block/blk-merge.c b/block/blk-merge.c
index 05c17be0eea40a32f3a66b48ef0dad8f32bcb97c..0b097f6b1778606b874b2127695dda617bd3463f 100644 (file)
--- a/block/blk-merge.c
+++ b/block/blk-merge.c
@@ -89,6 +89,8 @@ static int blk_phys_contig_segment(struct request_queue *q, struct bio *bio,
        struct bio_vec end_bv, nxt_bv;
        struct bvec_iter iter;
 
+       uninitialized_var(end_bv);
+
        if (!blk_queue_cluster(q))
                return 0;
 
@@ -173,6 +175,8 @@ int blk_rq_map_sg(struct request_queue *q, struct request *rq,
        struct scatterlist *sg;
        int nsegs, cluster;
 
+       uninitialized_var(bvprv);
+
        nsegs = 0;
        cluster = blk_queue_cluster(q);
 
@@ -235,6 +239,8 @@ int blk_bio_map_sg(struct request_queue *q, struct bio *bio,
        int nsegs, cluster;
        struct bvec_iter iter;
 
+       uninitialized_var(bvprv);
+
        nsegs = 0;
        cluster = blk_queue_cluster(q);