Fix is_power_of_2() for longs

[fio.git] / fio.h

diff --git a/fio.h b/fio.h
index 3df5bd9fa53de0dc72839d598a869e2d0a976eba..544916f209bafe8317d54c970da5b3f321c58e8a 100644 (file)
--- a/fio.h
+++ b/fio.h
@@ -351,7 +351,7 @@ enum {
 
 #define __td_verror(td, err, msg, func)                                        \
        do {                                                            \
 
 #define __td_verror(td, err, msg, func)                                        \
        do {                                                            \

-               int ____e = (err);                                              \
+               unsigned int ____e = (err);                             \

                if ((td)->error)                                        \
                        break;                                          \
                (td)->error = ____e;                                    \
                if ((td)->error)                                        \
                        break;                                          \
                (td)->error = ____e;                                    \


@@ -441,6 +441,7 @@ extern char *num2str(unsigned long, int, int, int, int);
 extern int ioengine_load(struct thread_data *);
 extern int parse_dryrun(void);
 extern int fio_running_or_pending_io_threads(void);
 extern int ioengine_load(struct thread_data *);
 extern int parse_dryrun(void);
 extern int fio_running_or_pending_io_threads(void);

+extern void fio_set_fd_nonblocking(int, const char *);

 
 extern uintptr_t page_mask;
 extern uintptr_t page_size;
 
 extern uintptr_t page_mask;
 extern uintptr_t page_size;


@@ -587,7 +588,7 @@ static inline unsigned int td_min_bs(struct thread_data *td)
        return min(td->o.min_bs[DDIR_TRIM], min_bs);
 }
 
        return min(td->o.min_bs[DDIR_TRIM], min_bs);
 }
 

-static inline int is_power_of_2(unsigned int val)
+static inline int is_power_of_2(unsigned long val)

 {
        return (val != 0 && ((val & (val - 1)) == 0));
 }
 {
        return (val != 0 && ((val & (val - 1)) == 0));
 }