No need to do fadvise() on O_DIRECT/raw IO

[fio.git] / init.c

diff --git a/init.c b/init.c
index 557382b6a1b8c2e25c4ff42aaf1ab85a1c0ff0fa..8efb24ab58bf17428797e364e045ecb490d6f1eb 100644 (file)
--- a/init.c
+++ b/init.c
@@ -85,11 +85,24 @@ static struct fio_option options[] = {
                .help   = "IO engine to use",
                .def    = "sync",
                .posval = {
-                         { .ival = "sync", }, { .ival = "libaio", },
-                         { .ival = "posixaio", }, { .ival = "mmap", },
-                         { .ival = "splice", }, { .ival = "sg", },
+                         { .ival = "sync", },
+#ifdef FIO_HAVE_LIBAIO
+                         { .ival = "libaio", },
+#endif
+#ifdef FIO_HAVE_POSIXAIO
+                         { .ival = "posixaio", },
+#endif
+                         { .ival = "mmap", },
+#ifdef FIO_HAVE_SPLICE
+                         { .ival = "splice", },
+#endif
+#ifdef FIO_HAVE_SGIO
+                         { .ival = "sg", },
+#endif
                          { .ival = "null", }, { .ival = "net", },
+#ifdef FIO_HAVE_SYSLET
                          { .ival = "syslet-rw", },
+#endif
                          },
        },
        {
@@ -991,8 +1004,6 @@ static int str_ioengine_cb(void *data, const char *str)
        if (td->io_ops)
                return 0;
 
-       log_err("fio: ioengine= libaio, posixaio, sync, syslet-rw, mmap, sgio, splice, cpu, null\n");
-       log_err("fio: or specify path to dynamic ioengine module\n");
        return 1;
 }
 
@@ -1217,10 +1228,8 @@ static int parse_cmd_line(int argc, char *argv[])
                        }
 
                        ret = parse_cmd_option(opt, val, options, td);
-                       if (ret) {
+                       if (ret)
                                dont_add_job = 1;
-                               log_err("fio: job dropped\n");
-                       }
                        break;
                }
                default: