Revert "Remove verify_pattern option, replace with verify=pattern:x"

[fio.git] / fio.c

diff --git a/fio.c b/fio.c
index 6f9a378b3599084927f1cb940aa9b28d8ff7648d..1c79d6823ae95079f0b445ceac9ed7507bb9be3b 100644 (file)
--- a/fio.c
+++ b/fio.c
@@ -568,6 +568,10 @@ sync_done:
                }
        }
 
+       if (td->o.fill_device && td->error == ENOSPC) {
+               td->error = 0;
+               td->terminate = 1;
+       }
        if (!td->error) {
                struct fio_file *f;
 
@@ -787,9 +791,8 @@ static int clear_io_state(struct thread_data *td)
  */
 static void *thread_main(void *data)
 {
-       unsigned long long runtime[2];
+       unsigned long long runtime[2], elapsed;
        struct thread_data *td = data;
-       unsigned long elapsed;
        int clear_state;
 
        if (!td->o.use_thread)
@@ -829,7 +832,7 @@ static void *thread_main(void *data)
                goto err;
        }
 
-       if (td->ioprio) {
+       if (td->ioprio_set) {
                if (ioprio_set(IOPRIO_WHO_PROCESS, 0, td->ioprio) == -1) {
                        td_verror(td, errno, "ioprio_set");
                        goto err;