diff options
author | Sage Weil <sage@inktank.com> | 2013-06-09 11:40:39 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-01-09 15:24:25 -0500 |
commit | 9a640548c96a4cc18394550ecce2241186f7357f (patch) | |
tree | a6b37c77c00cd0f8775ceb431a286e834874e5b6 | |
parent | 1f69fb068f24ac8bdf7b404dd49d0da7fb1a0d24 (diff) |
rbd: fix a couple warnings
commit e976cad0f0dbe5440a4ca38e29e1f932d9319125 upstream.
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r-- | drivers/block/rbd.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c index 8326b39b0576..10c45e101c97 100644 --- a/drivers/block/rbd.c +++ b/drivers/block/rbd.c | |||
@@ -2173,9 +2173,9 @@ static int rbd_img_request_fill(struct rbd_img_request *img_request, | |||
2173 | struct rbd_obj_request *obj_request = NULL; | 2173 | struct rbd_obj_request *obj_request = NULL; |
2174 | struct rbd_obj_request *next_obj_request; | 2174 | struct rbd_obj_request *next_obj_request; |
2175 | bool write_request = img_request_write_test(img_request); | 2175 | bool write_request = img_request_write_test(img_request); |
2176 | struct bio *bio_list; | 2176 | struct bio *bio_list = 0; |
2177 | unsigned int bio_offset = 0; | 2177 | unsigned int bio_offset = 0; |
2178 | struct page **pages; | 2178 | struct page **pages = 0; |
2179 | u64 img_offset; | 2179 | u64 img_offset; |
2180 | u64 resid; | 2180 | u64 resid; |
2181 | u16 opcode; | 2181 | u16 opcode; |