From: Kent Overstreet Date: Wed, 27 Nov 2013 00:36:49 +0000 (-0800) Subject: block: Silence spurious compiler warnings X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=3f273d301b535ef46f9c689e5b2828b741e81050;p=deliverable%2Flinux.git block: Silence spurious compiler warnings Signed-off-by: Kent Overstreet Signed-off-by: Jens Axboe --- diff --git a/block/blk-merge.c b/block/blk-merge.c index 05c17be0eea4..0b097f6b1778 100644 --- 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);