aboutsummaryrefslogtreecommitdiff
path: root/block/blk-merge.c
diff options
context:
space:
mode:
authorKent Overstreet <kmo@daterainc.com>2013-11-26 16:36:49 -0800
committerJens Axboe <axboe@kernel.dk>2013-11-26 17:50:37 -0700
commit3f273d301b535ef46f9c689e5b2828b741e81050 (patch)
treeac66fc64d2f8eb5a6286755b18882298bb0c4964 /block/blk-merge.c
parent4b1faf931650d4a35b2a570318862821d6a962e3 (diff)
downloadlinux-linaro-stable-3f273d301b535ef46f9c689e5b2828b741e81050.tar.gz
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/blk-merge.c')
-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,
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);