[PATCH] block: Silence spurious compiler warnings

From: Kent Overstreet
Date: Tue Nov 26 2013 - 19:36:49 EST


Signed-off-by: Kent Overstreet <kmo@xxxxxxxxxxxxx>
---

On Tue, Nov 26, 2013 at 12:02:08PM -0700, Jens Axboe wrote:
> On 11/26/2013 12:01 PM, Olof Johansson wrote:
> > I just noticed that i see this with gcc 4.7.0, but 4.8.1 does not warn.
>
> That's good, because it's not a bug. But arguably we should shut up 4.7
> as well, however...

Here you go:

block/blk-merge.c | 6 ++++++
1 file changed, 6 insertions(+)

diff --git a/block/blk-merge.c b/block/blk-merge.c
index 05c17be..0b097f6 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);

--
1.8.4.4

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/