Fix a few 4.8 extra anal warnings

[fio.git] / fio.h

diff --git a/fio.h b/fio.h
index c8c8b7abdd46db6e4743b2262f9047bffc7cceed..47e711fd4482f3adbf676aaade486e3a7f93a05f 100644 (file)
--- a/fio.h
+++ b/fio.h
@@ -20,7 +20,6 @@ struct thread_data;
 #include "thread_options.h"
 #include "flist.h"
 #include "fifo.h"
-#include "lib/rbtree.h"
 #include "arch/arch.h"
 #include "os/os.h"
 #include "mutex.h"
@@ -37,6 +36,7 @@ struct thread_data;
 #include "gettime.h"
 #include "lib/getopt.h"
 #include "lib/rand.h"
+#include "lib/rbtree.h"
 #include "client.h"
 #include "server.h"
 #include "stat.h"
@@ -388,7 +388,8 @@ static int __NON_FATAL_ERR[] = {EIO, EILSEQ};
 static inline int td_non_fatal_error(struct thread_data *td,
                                     enum error_type_bit etype, int err)
 {
-       int i;
+       unsigned int i;
+
        if (!td->o.ignore_error[etype]) {
                td->o.ignore_error[etype] = __NON_FATAL_ERR;
                td->o.ignore_error_nr[etype] = sizeof(__NON_FATAL_ERR)
@@ -445,8 +446,8 @@ extern void add_job_opts(const char **, int);
 extern char *num2str(unsigned long, int, int, int, int);
 extern int ioengine_load(struct thread_data *);
 
-extern unsigned long page_mask;
-extern unsigned long page_size;
+extern uintptr_t page_mask;
+extern uintptr_t page_size;
 extern int initialize_fio(char *envp[]);
 
 #define FIO_GETOPT_JOB         0x89000000