commit d4eb4654a799f4a878ae62fac8e3c758a5dae0f8
author Jens Axboe <axboe@fb.com> Mon Nov 10 15:40:24 2014 -0700
committer Mohamad Ayyash <mkayyash@google.com> Fri Mar 06 17:58:03 2015 -0800
tree 5b6b3a0b38be4839dec49ace6551afbaf379526f
parent b89f89e64592907195d5642abd33e696dbd716a4

Get rid if ddir_trim() macro

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

io_ddir.h

diff --git a/io_ddir.h b/io_ddir.h
index a23ea62..795cecc 100644
--- a/io_ddir.h
+++ b/io_ddir.h
@@ -64,8 +64,6 @@
 	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])
 

io_u.c

diff --git a/io_u.c b/io_u.c
index 438ad5d..e8894d5 100644
--- a/io_u.c
+++ b/io_u.c
@@ -580,8 +580,8 @@
 	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;
 }

ioengines.c

diff --git a/ioengines.c b/ioengines.c
index 07d1d56..6370a56 100644
--- a/ioengines.c
+++ b/ioengines.c
@@ -321,7 +321,7 @@
 			 "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);
 	}