From 041c462d8b4a8b8c8b0d84e967372250c250eaec Mon Sep 17 00:00:00 2001 From: Jens Axboe Date: Mon, 15 Aug 2016 12:13:57 -0600 Subject: [PATCH] parse: get rid of __td_var() Signed-off-by: Jens Axboe --- parse.h | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/parse.h b/parse.h index aa00a679..62fd9706 100644 --- a/parse.h +++ b/parse.h @@ -109,16 +109,18 @@ typedef int (fio_opt_str_val_fn)(void *, long long *); typedef int (fio_opt_int_fn)(void *, int *); typedef int (fio_opt_str_set_fn)(void *); -#define __td_var(start, offset) ((char *) start + (offset)) - struct thread_options; static inline void *td_var(struct thread_options *to, struct fio_option *o, unsigned int offset) { + void *ret; + if (o->prof_opts) - return __td_var(o->prof_opts, offset); + ret = o->prof_opts; + else + ret = to; - return __td_var(to, offset); + return ret + offset; } static inline int parse_is_percent(unsigned long long val) -- 2.25.1