rbd: fix a couple warnings
authorSage Weil <sage@inktank.com>
Sun, 9 Jun 2013 15:40:39 +0000 (08:40 -0700)
committerSage Weil <sage@inktank.com>
Wed, 3 Jul 2013 22:32:50 +0000 (15:32 -0700)
gcc isn't quite smart enough and generates these warnings:

drivers/block/rbd.c: In function 'rbd_img_request_fill':
drivers/block/rbd.c:1266:22: warning: 'bio_list' may be used uninitialized in this function [-Wmaybe-uninitialized]
drivers/block/rbd.c:2186:14: note: 'bio_list' was declared here
drivers/block/rbd.c:2247:10: warning: 'pages' may be used uninitialized in this function [-Wmaybe-uninitialized]

even though they are initialized for their respective code paths.

Signed-off-by: Sage Weil <sage@inktank.com>
drivers/block/rbd.c

index 14c6dc92ef0e1db3c6f301de683ae96b59eb7199..4ad2ad9a5bb01448d6d2206a3387575718c47b87 100644 (file)
@@ -2163,9 +2163,9 @@ static int rbd_img_request_fill(struct rbd_img_request *img_request,
        struct rbd_obj_request *obj_request = NULL;
        struct rbd_obj_request *next_obj_request;
        bool write_request = img_request_write_test(img_request);
-       struct bio *bio_list;
+       struct bio *bio_list = 0;
        unsigned int bio_offset = 0;
-       struct page **pages;
+       struct page **pages = 0;
        u64 img_offset;
        u64 resid;
        u16 opcode;