aboutsummaryrefslogtreecommitdiffstats
path: root/block
diff options
context:
space:
mode:
authorKent Overstreet <kmo@daterainc.com>2013-11-26 19:36:49 -0500
committerJens Axboe <axboe@kernel.dk>2013-11-26 19:50:37 -0500
commit3f273d301b535ef46f9c689e5b2828b741e81050 (patch)
treeac66fc64d2f8eb5a6286755b18882298bb0c4964 /block
parent4b1faf931650d4a35b2a570318862821d6a962e3 (diff)
block: Silence spurious compiler warnings
Signed-off-by: Kent Overstreet <kmo@daterainc.com> Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'block')
-rw-r--r--block/blk-merge.c6
1 files changed, 6 insertions, 0 deletions
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,
89 struct bio_vec end_bv, nxt_bv; 89 struct bio_vec end_bv, nxt_bv;
90 struct bvec_iter iter; 90 struct bvec_iter iter;
91 91
92 uninitialized_var(end_bv);
93
92 if (!blk_queue_cluster(q)) 94 if (!blk_queue_cluster(q))
93 return 0; 95 return 0;
94 96
@@ -173,6 +175,8 @@ int blk_rq_map_sg(struct request_queue *q, struct request *rq,
173 struct scatterlist *sg; 175 struct scatterlist *sg;
174 int nsegs, cluster; 176 int nsegs, cluster;
175 177
178 uninitialized_var(bvprv);
179
176 nsegs = 0; 180 nsegs = 0;
177 cluster = blk_queue_cluster(q); 181 cluster = blk_queue_cluster(q);
178 182
@@ -235,6 +239,8 @@ int blk_bio_map_sg(struct request_queue *q, struct bio *bio,
235 int nsegs, cluster; 239 int nsegs, cluster;
236 struct bvec_iter iter; 240 struct bvec_iter iter;
237 241
242 uninitialized_var(bvprv);
243
238 nsegs = 0; 244 nsegs = 0;
239 cluster = blk_queue_cluster(q); 245 cluster = blk_queue_cluster(q);
240 246