Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2b8221e1 authored by Kent Overstreet's avatar Kent Overstreet Committed by Jens Axboe
Browse files

block: Really silence spurious compiler warnings 



The uninitialized_var() macro appears to not work on structs...
Get rid of it, and manually initialize instead.

Signed-off-by: default avatarKent Overstreet <kmo@daterainc.com>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 3f273d30

block/blk-merge.c

+3 −9
Original line number Original line Diff line number Diff line
@@ -86,11 +86,9 @@ EXPORT_SYMBOL(blk_recount_segments); 
static int blk_phys_contig_segment(struct request_queue *q, struct bio *bio,

static int blk_phys_contig_segment(struct request_queue *q, struct bio *bio,

				   struct bio *nxt)

				   struct bio *nxt)

{

{

	struct bio_vec end_bv, nxt_bv;

	struct bio_vec end_bv = { NULL }, nxt_bv;

	struct bvec_iter iter;

	struct bvec_iter iter;





	uninitialized_var(end_bv);



	if (!blk_queue_cluster(q))

	if (!blk_queue_cluster(q))

		return 0;

		return 0;
@@ -170,13 +168,11 @@ __blk_segment_map_sg(struct request_queue *q, struct bio_vec *bvec, 
int blk_rq_map_sg(struct request_queue *q, struct request *rq,

int blk_rq_map_sg(struct request_queue *q, struct request *rq,

		  struct scatterlist *sglist)

		  struct scatterlist *sglist)

{

{

	struct bio_vec bvec, bvprv;

	struct bio_vec bvec, bvprv = { NULL };

	struct req_iterator iter;

	struct req_iterator iter;

	struct scatterlist *sg;

	struct scatterlist *sg;

	int nsegs, cluster;

	int nsegs, cluster;





	uninitialized_var(bvprv);



	nsegs = 0;

	nsegs = 0;

	cluster = blk_queue_cluster(q);

	cluster = blk_queue_cluster(q);
@@ -234,13 +230,11 @@ EXPORT_SYMBOL(blk_rq_map_sg); 
int blk_bio_map_sg(struct request_queue *q, struct bio *bio,

int blk_bio_map_sg(struct request_queue *q, struct bio *bio,

		   struct scatterlist *sglist)

		   struct scatterlist *sglist)

{

{

	struct bio_vec bvec, bvprv;

	struct bio_vec bvec, bvprv = { NULL };

	struct scatterlist *sg;

	struct scatterlist *sg;

	int nsegs, cluster;

	int nsegs, cluster;

	struct bvec_iter iter;

	struct bvec_iter iter;





	uninitialized_var(bvprv);



	nsegs = 0;

	nsegs = 0;

	cluster = blk_queue_cluster(q);

	cluster = blk_queue_cluster(q);