diff options
| author | Kent Overstreet <kmo@daterainc.com> | 2013-10-31 14:33:44 -0700 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2013-11-01 09:01:52 -0600 |
| commit | a7984f893c3b4333eb70272e80b9cfd0c5d6fe60 (patch) | |
| tree | 055cf54277892d5b5507bd50188f8e5281464a55 /block | |
| parent | febca1baea1cfe2d7a0271385d89b03d5fb34f94 (diff) | |
block: Fix some spurious gcc warnings
gcc was complaining about bvprv/ivprv being uninitialized; it wasn't quite smart
enough to understand the logic that prevented them from being used
uninitialized.
Signed-off-by: Kent Overstreet <kmo@daterainc.com>
Cc: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'block')
| -rw-r--r-- | block/blk-integrity.c | 4 | ||||
| -rw-r--r-- | block/blk-merge.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/block/blk-integrity.c b/block/blk-integrity.c index 861fcae01458..7fbab84399e6 100644 --- a/block/blk-integrity.c +++ b/block/blk-integrity.c @@ -43,7 +43,7 @@ static const char *bi_unsupported_name = "unsupported"; */ int blk_rq_count_integrity_sg(struct request_queue *q, struct bio *bio) { - struct bio_vec iv, ivprv; + struct bio_vec iv, ivprv = { NULL }; unsigned int segments = 0; unsigned int seg_size = 0; struct bvec_iter iter; @@ -89,7 +89,7 @@ EXPORT_SYMBOL(blk_rq_count_integrity_sg); int blk_rq_map_integrity_sg(struct request_queue *q, struct bio *bio, struct scatterlist *sglist) { - struct bio_vec iv, ivprv; + struct bio_vec iv, ivprv = { NULL }; struct scatterlist *sg = NULL; unsigned int segments = 0; struct bvec_iter iter; diff --git a/block/blk-merge.c b/block/blk-merge.c index 41a707292bf0..953b8dfbdc4b 100644 --- a/block/blk-merge.c +++ b/block/blk-merge.c @@ -12,7 +12,7 @@ static unsigned int __blk_recalc_rq_segments(struct request_queue *q, struct bio *bio) { - struct bio_vec bv, bvprv; + struct bio_vec bv, bvprv = { NULL }; int cluster, high, highprv = 1; unsigned int seg_size, nr_phys_segs; struct bio *fbio, *bbio; |