io_u: cleanup check_get_trim()
authorJens Axboe <axboe@kernel.dk>
Thu, 30 Nov 2017 14:03:33 +0000 (07:03 -0700)
committerJens Axboe <axboe@kernel.dk>
Thu, 30 Nov 2017 14:03:33 +0000 (07:03 -0700)
Signed-off-by: Jens Axboe <axboe@kernel.dk>
io_u.c

diff --git a/io_u.c b/io_u.c
index c258542..086384a 100644 (file)
--- a/io_u.c
+++ b/io_u.c
@@ -1615,22 +1615,19 @@ static bool check_get_trim(struct thread_data *td, struct io_u *io_u)
 {
        if (!(td->flags & TD_F_TRIM_BACKLOG))
                return false;
+       if (!td->trim_entries)
+               return false;
 
-       if (td->trim_entries) {
-               int get_trim = 0;
-
-               if (td->trim_batch) {
-                       td->trim_batch--;
-                       get_trim = 1;
-               } else if (!(td->io_hist_len % td->o.trim_backlog) &&
-                        td->last_ddir != DDIR_READ) {
-                       td->trim_batch = td->o.trim_batch;
-                       if (!td->trim_batch)
-                               td->trim_batch = td->o.trim_backlog;
-                       get_trim = 1;
-               }
-
-               if (get_trim && get_next_trim(td, io_u))
+       if (td->trim_batch) {
+               td->trim_batch--;
+               if (get_next_trim(td, io_u))
+                       return true;
+       } else if (!(td->io_hist_len % td->o.trim_backlog) &&
+                    td->last_ddir != DDIR_READ) {
+               td->trim_batch = td->o.trim_batch;
+               if (!td->trim_batch)
+                       td->trim_batch = td->o.trim_backlog;
+               if (get_next_trim(td, io_u))
                        return true;
        }