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

Commit fd16d263 authored by Joe Perches's avatar Joe Perches Committed by Jens Axboe
Browse files

block: Add __attribute__((format(printf...) and fix fallout 



Use the compiler to verify format strings and arguments.

Fix fallout.

Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarJens Axboe <jaxboe@fusionio.com>
parent dd774093

block/blk-throttle.c

+2 −2
Original line number Diff line number Diff line
@@ -927,7 +927,7 @@ static int throtl_dispatch(struct request_queue *q) 


	bio_list_init(&bio_list_on_stack);



	throtl_log(td, "dispatch nr_queued=%lu read=%u write=%u",

	throtl_log(td, "dispatch nr_queued=%d read=%u write=%u",

			total_nr_queued(td), td->nr_queued[READ],

			td->nr_queued[WRITE]);
@@ -1204,7 +1204,7 @@ int blk_throtl_bio(struct request_queue *q, struct bio **biop) 
	}



queue_bio:

	throtl_log_tg(td, tg, "[%c] bio. bdisp=%u sz=%u bps=%llu"

	throtl_log_tg(td, tg, "[%c] bio. bdisp=%llu sz=%u bps=%llu"

			" iodisp=%u iops=%u queued=%d/%d",

			rw == READ ? 'R' : 'W',

			tg->bytes_disp[rw], bio->bi_size, tg->bps[rw],

block/cfq-iosched.c

+6 −5
Original line number Diff line number Diff line
@@ -988,8 +988,9 @@ static void cfq_group_served(struct cfq_data *cfqd, struct cfq_group *cfqg, 


	cfq_log_cfqg(cfqd, cfqg, "served: vt=%llu min_vt=%llu", cfqg->vdisktime,

					st->min_vdisktime);

	cfq_log_cfqq(cfqq->cfqd, cfqq, "sl_used=%u disp=%u charge=%u iops=%u"

			" sect=%u", used_sl, cfqq->slice_dispatch, charge,

	cfq_log_cfqq(cfqq->cfqd, cfqq,

		     "sl_used=%u disp=%u charge=%u iops=%u sect=%lu",

		     used_sl, cfqq->slice_dispatch, charge,

		     iops_mode(cfqd), cfqq->nr_sectors);

	cfq_blkiocg_update_timeslice_used(&cfqg->blkg, used_sl,

					  unaccounted_sl);
@@ -2018,7 +2019,7 @@ static void cfq_arm_slice_timer(struct cfq_data *cfqd) 
	 */

	if (sample_valid(cic->ttime_samples) &&

	    (cfqq->slice_end - jiffies < cic->ttime_mean)) {

		cfq_log_cfqq(cfqd, cfqq, "Not idling. think_time:%d",

		cfq_log_cfqq(cfqd, cfqq, "Not idling. think_time:%lu",

			     cic->ttime_mean);

		return;

	}

include/linux/blktrace_api.h

+2 −1
Original line number Diff line number Diff line
@@ -169,7 +169,8 @@ extern void blk_trace_shutdown(struct request_queue *); 
extern int do_blk_trace_setup(struct request_queue *q, char *name,

			      dev_t dev, struct block_device *bdev,

			      struct blk_user_trace_setup *buts);

extern void __trace_note_message(struct blk_trace *, const char *fmt, ...);

extern __attribute__((format(printf, 2, 3)))

void __trace_note_message(struct blk_trace *, const char *fmt, ...);



/**

 * blk_add_trace_msg - Add a (simple) message to the blktrace stream