eta: fix dead variable assignments

[fio.git] / backend.c

diff --git a/backend.c b/backend.c
index fe335b5edbd1db3da837f095d1950a1408d3c256..b28c3dbc4fd65fdf71b3ad4581a9b27e9aac7511 100644 (file)
--- a/backend.c
+++ b/backend.c
@@ -723,6 +723,7 @@ static void do_verify(struct thread_data *td, uint64_t verify_bytes)
                                        break;
                                } else if (io_u->ddir == DDIR_WRITE) {
                                        io_u->ddir = DDIR_READ;
+                                       populate_verify_io_u(td, io_u);
                                        break;
                                } else {
                                        put_io_u(td, io_u);
@@ -995,6 +996,9 @@ static void do_io(struct thread_data *td, uint64_t *bytes_done)
                        break;
                }
 
+               if (io_u->ddir == DDIR_WRITE && td->flags & TD_F_DO_VERIFY)
+                       populate_verify_io_u(td, io_u);
+
                ddir = io_u->ddir;
 
                /*
@@ -1328,7 +1332,7 @@ static int init_io_u(struct thread_data *td)
 static int switch_ioscheduler(struct thread_data *td)
 {
 #ifdef FIO_HAVE_IOSCHED_SWITCH
-       char tmp[256], tmp2[128];
+       char tmp[256], tmp2[128], *p;
        FILE *f;
        int ret;
 
@@ -1372,9 +1376,11 @@ static int switch_ioscheduler(struct thread_data *td)
        }
        tmp[ret] = '\0';
        /*
-        * either a list of io schedulers or "none\n" is expected.
+        * either a list of io schedulers or "none\n" is expected. Strip the
+        * trailing newline.
         */
-       tmp[strlen(tmp) - 1] = '\0';
+       p = tmp;
+       strsep(&p, "\n");
 
        /*
         * Write to "none" entry doesn't fail, so check the result here.