From 77b451cc30ab109050235e80b4988ab3abbe6d13 Mon Sep 17 00:00:00 2001 From: Jens Axboe Date: Mon, 10 Nov 2014 15:40:24 -0700 Subject: [PATCH] Get rid if ddir_trim() macro Signed-off-by: Jens Axboe --- io_ddir.h | 2 -- io_u.c | 4 ++-- ioengines.c | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/io_ddir.h b/io_ddir.h index a23ea626..795ceccc 100644 --- a/io_ddir.h +++ b/io_ddir.h @@ -64,8 +64,6 @@ static inline const char *ddir_str(enum td_ddir ddir) return ddir_str[ddir]; } -#define ddir_trim(ddir) ((ddir) == DDIR_TRIM) - #define ddir_rw_sum(arr) \ ((arr)[DDIR_READ] + (arr)[DDIR_WRITE] + (arr)[DDIR_TRIM]) diff --git a/io_u.c b/io_u.c index 438ad5df..e8894d5d 100644 --- a/io_u.c +++ b/io_u.c @@ -580,8 +580,8 @@ static enum fio_ddir rate_ddir(struct thread_data *td, enum fio_ddir ddir) if (td_rw(td) && __should_check_rate(td, odir)) td->rate_pending_usleep[odir] -= usec; - if (ddir_trim(ddir)) - return ddir; + if (ddir == DDIR_TRIM) + return DDIR_TRIM; return ddir; } diff --git a/ioengines.c b/ioengines.c index 07d1d567..6370a562 100644 --- a/ioengines.c +++ b/ioengines.c @@ -321,7 +321,7 @@ int td_io_queue(struct thread_data *td, struct io_u *io_u) "support direct IO, or iomem_align= is bad.\n"); } - if (!td->io_ops->commit || ddir_trim(io_u->ddir)) { + if (!td->io_ops->commit || io_u->ddir == DDIR_TRIM) { io_u_mark_submit(td, 1); io_u_mark_complete(td, 1); } -- 2.25.1