Merge branch 'ioring_add_sync_file_range' of https://github.com/anarazel/fio
authorJens Axboe <axboe@kernel.dk>
Thu, 12 Sep 2019 20:24:23 +0000 (14:24 -0600)
committerJens Axboe <axboe@kernel.dk>
Thu, 12 Sep 2019 20:24:23 +0000 (14:24 -0600)
* 'ioring_add_sync_file_range' of https://github.com/anarazel/fio:
  engines/io_uring: Add support for sync_file_range.

engines/io_uring.c

index 93ffb5bde7c00abafe9bb43f98d6f9511d0d66ed..53cb60c5a50042fe7a33ff70c8f1f984adf8a586 100644 (file)
@@ -266,7 +266,7 @@ static int fio_ioring_getevents(struct thread_data *td, unsigned int min,
                        r = io_uring_enter(ld, 0, actual_min,
                                                IORING_ENTER_GETEVENTS);
                        if (r < 0) {
-                               if (errno == EAGAIN)
+                               if (errno == EAGAIN || errno == EINTR)
                                        continue;
                                td_verror(td, errno, "io_uring_enter");
                                break;
@@ -377,7 +377,7 @@ static int fio_ioring_commit(struct thread_data *td)
                        io_u_mark_submit(td, ret);
                        continue;
                } else {
-                       if (errno == EAGAIN) {
+                       if (errno == EAGAIN || errno == EINTR) {
                                ret = fio_ioring_cqring_reap(td, 0, ld->queued);
                                if (ret)
                                        continue;