[PATCH] block: Fix compiler warnings in blk-merge.c

[Geliang Tang]

Fix the following warnings:

  CC      block/blk-merge.o
In file included from block/blk-merge.c:7:0:
block/blk-merge.c: In function âblk_queue_splitâ:
include/linux/blkdev.h:1368:21: warning: âbvprv.bv_offsetâ may be used
uninitialized in this function [-Wmaybe-uninitialized]
   ((bprv->bv_offset + bprv->bv_len) & queue_virt_boundary(q));
                     ^
block/blk-merge.c:70:21: note: âbvprv.bv_offsetâ was declared here
  struct bio_vec bv, bvprv;
                     ^
In file included from block/blk-merge.c:7:0:
include/linux/blkdev.h:1368:21: warning: âbvprv.bv_lenâ may be used
uninitialized in this function [-Wmaybe-uninitialized]
   ((bprv->bv_offset + bprv->bv_len) & queue_virt_boundary(q));
                     ^
block/blk-merge.c:70:21: note: âbvprv.bv_lenâ was declared here
  struct bio_vec bv, bvprv;
                     ^
In file included from ./arch/x86/include/asm/page.h:70:0,
                 from ./arch/x86/include/asm/thread_info.h:11,
                 from include/linux/thread_info.h:54,
                 from ./arch/x86/include/asm/preempt.h:6,
                 from include/linux/preempt.h:64,
                 from include/linux/spinlock.h:50,
                 from include/linux/seqlock.h:35,
                 from include/linux/time.h:5,
                 from include/linux/stat.h:18,
                 from include/linux/module.h:10,
                 from block/blk-merge.c:5:
include/asm-generic/memory_model.h:52:52: warning: âbvprv.bv_pageâ may
be used uninitialized in this function [-Wmaybe-uninitialized]
 #define __page_to_pfn(page) (unsigned long)((page) - vmemmap)
                                                    ^
block/blk-merge.c:70:21: note: âbvprv.bv_pageâ was declared here
  struct bio_vec bv, bvprv;
                     ^

Signed-off-by: Geliang Tang <geliangtang@xxxxxxx>
---
 block/blk-merge.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/block/blk-merge.c b/block/blk-merge.c
index d088cff..5bd84c8 100644
--- a/block/blk-merge.c
+++ b/block/blk-merge.c
@@ -67,7 +67,7 @@ static struct bio *blk_bio_segment_split(struct request_queue *q,
 					 struct bio_set *bs)
 {
 	struct bio *split;
-	struct bio_vec bv, bvprv;
+	struct bio_vec bv, bvprv = { NULL };
 	struct bvec_iter iter;
 	unsigned seg_size = 0, nsegs = 0, sectors = 0;
 	int prev = 0;
-- 
2.3.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/