From df415585cd9c54472b7aa77b9eca6206ab0cbb4f Mon Sep 17 00:00:00 2001 From: Jens Axboe Date: Fri, 20 Oct 2006 11:41:03 +0200 Subject: [PATCH 1/1] [PATCH] Move related code next to each other Signed-off-by: Jens Axboe --- io_u.c | 58 +++++++++++++++++++++++++++++----------------------------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/io_u.c b/io_u.c index baf5d474..962c17a9 100644 --- a/io_u.c +++ b/io_u.c @@ -21,6 +21,35 @@ static int random_map_free(struct thread_data *td, struct fio_file *f, return (f->file_map[idx] & (1UL << bit)) == 0; } +/* + * Mark a given offset as used in the map. + */ +static void mark_random_map(struct thread_data *td, struct fio_file *f, + struct io_u *io_u) +{ + unsigned long long block = io_u->offset / (unsigned long long) td->min_bs; + unsigned int blocks = 0; + + while (blocks < (io_u->buflen / td->min_bs)) { + unsigned int idx, bit; + + if (!random_map_free(td, f, block)) + break; + + idx = RAND_MAP_IDX(td, f, block); + bit = RAND_MAP_BIT(td, f, block); + + assert(idx < f->num_maps); + + f->file_map[idx] |= (1UL << bit); + block++; + blocks++; + } + + if ((blocks * td->min_bs) < io_u->buflen) + io_u->buflen = blocks * td->min_bs; +} + /* * Return the next free block in the map. */ @@ -143,35 +172,6 @@ static int get_rw_ddir(struct thread_data *td) return DDIR_WRITE; } -/* - * Mark a given offset as used in the map. - */ -static void mark_random_map(struct thread_data *td, struct fio_file *f, - struct io_u *io_u) -{ - unsigned long long block = io_u->offset / (unsigned long long) td->min_bs; - unsigned int blocks = 0; - - while (blocks < (io_u->buflen / td->min_bs)) { - unsigned int idx, bit; - - if (!random_map_free(td, f, block)) - break; - - idx = RAND_MAP_IDX(td, f, block); - bit = RAND_MAP_BIT(td, f, block); - - assert(idx < f->num_maps); - - f->file_map[idx] |= (1UL << bit); - block++; - blocks++; - } - - if ((blocks * td->min_bs) < io_u->buflen) - io_u->buflen = blocks * td->min_bs; -} - void put_io_u(struct thread_data *td, struct io_u *io_u) { io_u->file = NULL; -- 2.25.1