configure: fix more old FIO_HAVE_ checks

Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/Makefile b/Makefile
index 1492516a034951eb068c0e698ef89e381c49e409..84988f8acc933b6783db1a4ff03240929bc5c0b5 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -61,6 +61,7 @@ ifdef CONFIG_LINUX_FALLOCATE
   SOURCE += engines/falloc.c
 endif
 ifdef CONFIG_LINUX_EXT4_MOVE_EXTENT
+  CFLAGS += -DCONFIG_LINUX_EXT4_MOVE_EXTENT
   SOURCE += engines/e4defrag.c
 endif
 ifdef CONFIG_LINUX_SPLICE

diff --git a/options.c b/options.c
index da9a95330bf0669c78a99bc621a3fe33e44a847c..ed437be2697d461295120f666257d20d8177d5ec 100644 (file)
--- a/options.c
+++ b/options.c
@@ -1277,7 +1277,7 @@ static struct fio_option options[FIO_MAX_OPTS] = {
                            .help = "POSIX asynchronous IO",
                          },
 #endif
-#ifdef FIO_HAVE_SOLARISAIO
+#ifdef CONFIG_SOLARISAIO
                          { .ival = "solarisaio",
                            .help = "Solaris native asynchronous IO",
                          },
@@ -1332,12 +1332,12 @@ static struct fio_option options[FIO_MAX_OPTS] = {
                            .help = "Fusion-io atomic write engine",
                          },
 #endif
-#ifdef FIO_HAVE_E4_ENG
+#ifdef CONFIG_LINUX_EXT4_MOVE_EXTENT
                          { .ival = "e4defrag",
                            .help = "ext4 defrag engine",
                          },
 #endif
-#ifdef FIO_HAVE_FALLOC_ENG
+#ifdef CONFIG_LINUX_FALLOCATE
                          { .ival = "falloc",
                            .help = "fallocate() file based engine",
                          },

diff --git a/os/os-solaris.h b/os/os-solaris.h
index de59f774d7fb1a8c51b9da20acf00c61923444da..e6612118ace4baf7afcae38eb9a7126ca45af10e 100644 (file)
--- a/os/os-solaris.h
+++ b/os/os-solaris.h
@@ -14,7 +14,6 @@
 
 #include "../file.h"
 
-#define FIO_HAVE_SOLARISAIO
 #define FIO_HAVE_CPU_AFFINITY
 #define FIO_HAVE_PSHARED_MUTEX
 #define FIO_HAVE_CHARDEV_SIZE