From aec2de209564a6951e6c91d653fc99a75508607d Mon Sep 17 00:00:00 2001 From: Jens Axboe Date: Thu, 24 Apr 2008 12:44:42 +0200 Subject: [PATCH 1/1] Kill unused parameters Signed-off-by: Jens Axboe --- blktrace.c | 4 ++-- fio.h | 6 +++--- io_u.c | 15 +++++++-------- log.c | 21 ++------------------- 4 files changed, 14 insertions(+), 32 deletions(-) diff --git a/blktrace.c b/blktrace.c index 579a39f6..46dc13bd 100644 --- a/blktrace.c +++ b/blktrace.c @@ -219,7 +219,7 @@ static void store_ipo(struct thread_data *td, unsigned long long offset, queue_io_piece(td, ipo); } -static void handle_trace_notify(struct thread_data *td, struct blk_io_trace *t) +static void handle_trace_notify( struct blk_io_trace *t) { switch (t->action) { case BLK_TN_PROCESS: @@ -266,7 +266,7 @@ static void handle_trace(struct thread_data *td, struct blk_io_trace *t, return; if (t->action & BLK_TC_ACT(BLK_TC_NOTIFY)) - handle_trace_notify(td, t); + handle_trace_notify(t); else handle_trace_fs(td, t, ttime, ios, bs); } diff --git a/fio.h b/fio.h index 036e62af..6f2c4c09 100644 --- a/fio.h +++ b/fio.h @@ -700,9 +700,9 @@ static inline void fio_ro_check(struct thread_data *td, struct io_u *io_u) } #define BLOCKS_PER_MAP (8 * sizeof(long)) -#define TO_MAP_BLOCK(td, f, b) (b) -#define RAND_MAP_IDX(td, f, b) (TO_MAP_BLOCK(td, f, b) / BLOCKS_PER_MAP) -#define RAND_MAP_BIT(td, f, b) (TO_MAP_BLOCK(td, f, b) & (BLOCKS_PER_MAP - 1)) +#define TO_MAP_BLOCK(f, b) (b) +#define RAND_MAP_IDX(f, b) (TO_MAP_BLOCK(f, b) / BLOCKS_PER_MAP) +#define RAND_MAP_BIT(f, b) (TO_MAP_BLOCK(f, b) & (BLOCKS_PER_MAP - 1)) #define MAX_JOBS (1024) diff --git a/io_u.c b/io_u.c index 46d9e0b7..985c99b2 100644 --- a/io_u.c +++ b/io_u.c @@ -24,11 +24,10 @@ struct io_completion_data { * The ->file_map[] contains a map of blocks we have or have not done io * to yet. Used to make sure we cover the entire range in a fair fashion. */ -static int random_map_free(struct thread_data *td, struct fio_file *f, - const unsigned long long block) +static int random_map_free(struct fio_file *f, const unsigned long long block) { - unsigned int idx = RAND_MAP_IDX(td, f, block); - unsigned int bit = RAND_MAP_BIT(td, f, block); + unsigned int idx = RAND_MAP_IDX(f, block); + unsigned int bit = RAND_MAP_BIT(f, block); dprint(FD_RANDOM, "free: b=%llu, idx=%u, bit=%u\n", block, idx, bit); @@ -57,11 +56,11 @@ static void mark_random_map(struct thread_data *td, struct io_u *io_u) * If we have a mixed random workload, we may * encounter blocks we already did IO to. */ - if ((td->o.ddir_nr == 1) && !random_map_free(td, f, block)) + if ((td->o.ddir_nr == 1) && !random_map_free(f, block)) break; - idx = RAND_MAP_IDX(td, f, block); - bit = RAND_MAP_BIT(td, f, block); + idx = RAND_MAP_IDX(f, block); + bit = RAND_MAP_BIT(f, block); fio_assert(td, idx < f->num_maps); @@ -136,7 +135,7 @@ static int get_next_rand_offset(struct thread_data *td, struct fio_file *f, /* * calculate map offset and check if it's free */ - if (random_map_free(td, f, *b)) + if (random_map_free(f, *b)) return 0; dprint(FD_RANDOM, "get_next_rand_offset: offset %llu busy\n", diff --git a/log.c b/log.c index 082cfd41..15de3c24 100644 --- a/log.c +++ b/log.c @@ -334,15 +334,6 @@ static int read_iolog2(struct thread_data *td, FILE *f) return 0; } -/* - * Read version 1 iolog data. - */ -static int read_iolog(struct thread_data *td, FILE *f) -{ - log_err("fio: iolog version 1 is no longer supported\n"); - return 1; -} - /* * open iolog, check version, and call appropriate parser */ @@ -372,16 +363,8 @@ static int init_iolog_read(struct thread_data *td) if (!strncmp(iolog_ver2, buffer, strlen(iolog_ver2))) ret = read_iolog2(td, f); else { - /* - * seek back to the beginning - */ - if (fseek(f, 0, SEEK_SET) < 0) { - td_verror(td, errno, "iolog read"); - log_err("fio: unable to read iolog\n"); - return 1; - } - - ret = read_iolog(td, f); + log_err("fio: iolog version 1 is no longer supported\n"); + ret = 1; } fclose(f); -- 2.25.1