From: Tomohiro Kusumi <tkusumi@xxxxxxxxxx> Since sg is Linux kernel's SCSI subsystem specific interface, it's better to include required headers in os/os-linux.h which also defines FIO_HAVE_SGIO, rather than conditionally including them in os/os.h. Android has FIO_HAVE_SGIO disabled, so no need to do this for Android. Even if another platform implements sg (compatible) ioctls within their SCSI driver, there is no guarantee the required kernel header will be "linux/fs.h", which then fails to compile. Signed-off-by: Tomohiro Kusumi <tkusumi@xxxxxxxxxx> --- os/os-linux.h | 2 ++ os/os.h | 5 ----- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/os/os-linux.h b/os/os-linux.h index ba53590..0e6246e 100644 --- a/os/os-linux.h +++ b/os/os-linux.h @@ -16,6 +16,8 @@ #include <linux/unistd.h> #include <linux/raw.h> #include <linux/major.h> +#include <linux/fs.h> +#include <scsi/sg.h> #include "./os-linux-syscall.h" #include "binject.h" diff --git a/os/os.h b/os/os.h index 21b7a9d..3c96b4d 100644 --- a/os/os.h +++ b/os/os.h @@ -60,11 +60,6 @@ typedef struct aiocb os_aiocb_t; #endif #endif -#ifdef FIO_HAVE_SGIO -#include <linux/fs.h> -#include <scsi/sg.h> -#endif - #ifndef CONFIG_STRSEP #include "../oslib/strsep.h" #endif -- 2.9.4 -- To unsubscribe from this list: send the line "unsubscribe fio" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
