sg/binject: only restore file flags if they have been set

[fio.git] / engines / sg.c

diff --git a/engines/sg.c b/engines/sg.c
index 87fe88352f2fd0d4eb77430e827cb4ffab8dbc92..1a027daeb353fca972da13cf8796983024364463 100644 (file)
--- a/engines/sg.c
+++ b/engines/sg.c
@@ -78,7 +78,9 @@ static int fio_sgio_getevents(struct thread_data *td, unsigned int min,
                 * don't block for min events == 0
                 */
                if (!min)
-                       fio_set_fd_nonblocking(f->fd, "sg");
+                       sd->fd_flags[i] = fio_set_fd_nonblocking(f->fd, "sg");
+               else
+                       sd->fd_flags[i] = -1;
 
                sd->pfds[i].fd = f->fd;
                sd->pfds[i].events = POLLIN;
@@ -143,6 +145,9 @@ re_read:
 
        if (!min) {
                for_each_file(td, f, i) {
+                       if (sd->fd_flags[i] == -1)
+                               continue;
+
                        if (fcntl(f->fd, F_SETFL, sd->fd_flags[i]) < 0)
                                log_err("fio: sg failed to restore fcntl flags: %s\n", strerror(errno));
                }