LU-12488 tests: Fix sanityn 93 for DNE configs

[fs/lustre-release.git] / lustre / tests / checkfiemap.c

diff --git a/lustre/tests/checkfiemap.c b/lustre/tests/checkfiemap.c
index b28beb6..2dea812 100644 (file)
--- a/lustre/tests/checkfiemap.c
+++ b/lustre/tests/checkfiemap.c
@@ -38,16 +38,12 @@
 #include <errno.h>
 #include <unistd.h>
 #include <getopt.h>
+#include <linux/types.h>
+#include <linux/fs.h>
+#include <linux/lustre/lustre_user.h>
 
-#ifndef HAVE_FIEMAP
-# include <linux/types.h>
-# include <linux/fiemap.h>
-#endif
-
-#ifdef __linux__
-# ifndef FS_IOC_FIEMAP
-#  define FS_IOC_FIEMAP (_IOWR('f', 11, struct fiemap))
-# endif
+#ifndef FS_IOC_FIEMAP
+# define FS_IOC_FIEMAP (_IOWR('f', 11, struct fiemap))
 #endif
 
 #define ONEMB 1048576
@@ -69,7 +65,7 @@ int check_fiemap(int fd, long long orig_size)
        memset(&fiemap_buf, 0, sizeof(fiemap_buf));
 
        fiemap->fm_start = 0;
-       fiemap->fm_flags = FIEMAP_FLAG_SYNC;
+       fiemap->fm_flags = (FIEMAP_FLAG_SYNC | FIEMAP_FLAG_DEVICE_ORDER);
        fiemap->fm_extent_count = count;
        fiemap->fm_length = FIEMAP_MAX_OFFSET;
 
@@ -105,8 +101,8 @@ int main(int argc, char **argv)
 {
        int c;
        struct option long_opts[] = {
-               {"test", no_argument, 0, 't'},
-               {NULL, 0, NULL, 0}
+               { .name = "test", .has_arg = no_argument, .val = 't' },
+               { .name = NULL }
        };
        int fd;
        int rc;