Get rid if ddir_trim() macro

Signed-off-by: Jens Axboe <axboe@fb.com>

diff --git a/io_ddir.h b/io_ddir.h
index a23ea626be83d9877a3c670719e7b3ef160124a4..795ceccc43822f19d6bfaf10390cca804714a93a 100644 (file)
--- 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];
 }
 
        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])
 
 #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 438ad5df26dc32aa411202216172543a6208b4fc..e8894d5dca62ff07a9e39174191ae877490793b5 100644 (file)
--- 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 (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;
 }
 
        return ddir;
 }

diff --git a/ioengines.c b/ioengines.c
index 07d1d5678986cbe86fd3c87eae1c3a413526ba2a..6370a562059a48b92360acab31202ef1e4d6d60f 100644 (file)
--- 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");
        }
 
                         "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);
        }
                io_u_mark_submit(td, 1);
                io_u_mark_complete(td, 1);
        }