xfstests: fix bulkstat related compile warnings.

Use correct types for bulkstat structure to avoid pointer warnings.

Signed-off-by: Dave Chinner <david@fromorbit.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>

diff --git a/ltp/fsstress.c b/ltp/fsstress.c
index 69783816b24ea9f8c1cf2957aee20790122cac50..c37cddf754847c49e978946cb32a27a86b71f56a 100644 (file)
--- a/ltp/fsstress.c
+++ b/ltp/fsstress.c
@@ -1550,7 +1550,7 @@ bulkstat_f(int opno, long r)
 {
        int             count;
        int             fd;
 {
        int             count;
        int             fd;

-       __uint64_t      last;
+       __u64           last;

        int             nent;
        xfs_bstat_t     *t;
        __int64_t       total;
        int             nent;
        xfs_bstat_t     *t;
        __int64_t       total;


@@ -1583,7 +1583,7 @@ bulkstat1_f(int opno, long r)
        pathname_t      f;
        int             fd;
        int             good;
        pathname_t      f;
        int             fd;
        int             good;

-       __uint64_t      ino;
+       __u64           ino;

        struct stat64   s;
        xfs_bstat_t     t;
        int             v;
        struct stat64   s;
        xfs_bstat_t     t;
        int             v;

diff --git a/src/bulkstat_unlink_test.c b/src/bulkstat_unlink_test.c
index 17d07c077c0d4cc081247d68f758c8b6667469a1..afd69ffec1b03ce91bbc83faa7fd574a700eb77b 100644 (file)
--- a/src/bulkstat_unlink_test.c
+++ b/src/bulkstat_unlink_test.c
@@ -68,7 +68,7 @@ main(int argc, char *argv[])
                printf("Iteration %d ... (%d files)", k, nfiles);
 
                memset(&a, 0, sizeof(xfs_fsop_bulkreq_t));
                printf("Iteration %d ... (%d files)", k, nfiles);
 
                memset(&a, 0, sizeof(xfs_fsop_bulkreq_t));

-               a.lastip = &last_inode;
+               a.lastip = (__u64 *)&last_inode;

                a.icount = nfiles;
                a.ubuffer = ret;
                a.ocount = &count;
                a.icount = nfiles;
                a.ubuffer = ret;
                a.ocount = &count;

diff --git a/src/bulkstat_unlink_test_modified.c b/src/bulkstat_unlink_test_modified.c
index 4acc91291b418982a4f86632d320fb3f9d21537e..3a50d61bfaffa5925bc1037da07183e7136a61b8 100644 (file)
--- a/src/bulkstat_unlink_test_modified.c
+++ b/src/bulkstat_unlink_test_modified.c
@@ -61,7 +61,7 @@ main(int argc, char *argv[])
        memset(genlist, 0, nfiles * sizeof(__u32));
        memset(ret, 0, nfiles * sizeof(xfs_bstat_t));
        memset(&a, 0, sizeof(xfs_fsop_bulkreq_t));
        memset(genlist, 0, nfiles * sizeof(__u32));
        memset(ret, 0, nfiles * sizeof(xfs_bstat_t));
        memset(&a, 0, sizeof(xfs_fsop_bulkreq_t));

-       a.lastip = &last_inode;
+       a.lastip = (__u64 *)&last_inode;

        a.icount = nfiles;
        a.ubuffer = ret;
        a.ocount = &count;
        a.icount = nfiles;
        a.ubuffer = ret;
        a.ocount = &count;

diff --git a/src/t_immutable.c b/src/t_immutable.c
index 07a36cdc858cef6ea0ecc7d9973d0a9f596f9ecc..7bb3154f25ee817bfe20ae12dee1e99a952d2a8b 100644 (file)
--- a/src/t_immutable.c
+++ b/src/t_immutable.c
@@ -283,7 +283,7 @@ static int test_immutable(const char *dir)
 
          ino = st.st_ino;
 
 
          ino = st.st_ino;
 

-         bulkreq.lastip = &ino;
+         bulkreq.lastip = (__u64 *)&ino;

          bulkreq.icount = 1;
          bulkreq.ubuffer = &bstat;
          bulkreq.ocount = NULL;
          bulkreq.icount = 1;
          bulkreq.ubuffer = &bstat;
          bulkreq.ocount = NULL;


@@ -943,7 +943,7 @@ static int test_append(const char *dir)
 
          ino = st.st_ino;
 
 
          ino = st.st_ino;
 

-         bulkreq.lastip = &ino;
+         bulkreq.lastip = (__u64 *)&ino;

          bulkreq.icount = 1;
          bulkreq.ubuffer = &bstat;
          bulkreq.ocount = NULL;
          bulkreq.icount = 1;
          bulkreq.ubuffer = &bstat;
          bulkreq.ocount = NULL;


@@ -1353,7 +1353,7 @@ static int test_append(const char *dir)
 
           ino = st.st_ino;
 
 
           ino = st.st_ino;
 

-          bulkreq.lastip = &ino;
+          bulkreq.lastip = (__u64 *)&ino;

           bulkreq.icount = 1;
           bulkreq.ubuffer = &bstat;
           bulkreq.ocount = NULL;
           bulkreq.icount = 1;
           bulkreq.ubuffer = &bstat;
           bulkreq.ocount = NULL;