glusterfs: silence printf specifier warnings

[fio.git] / stat.c

diff --git a/stat.c b/stat.c
index 4aa9cb8f3d80797fe59deec69dfdcadb29968530..63353cc0cd2bb496de27d6bda796ab130cb285d5 100644 (file)
--- a/stat.c
+++ b/stat.c
@@ -100,7 +100,8 @@ static unsigned int plat_val_to_idx(unsigned long long val)
  */
 static unsigned long long plat_idx_to_val(unsigned int idx)
 {
-       unsigned int error_bits, k, base;
+       unsigned int error_bits;
+       unsigned long long k, base;
 
        assert(idx < FIO_IO_U_PLAT_NR);
 
@@ -111,7 +112,7 @@ static unsigned long long plat_idx_to_val(unsigned int idx)
 
        /* Find the group and compute the minimum value of that group */
        error_bits = (idx >> FIO_IO_U_PLAT_BITS) - 1;
-       base = 1 << (error_bits + FIO_IO_U_PLAT_BITS);
+       base = ((unsigned long long) 1) << (error_bits + FIO_IO_U_PLAT_BITS);
 
        /* Find its bucket number of the group */
        k = idx % FIO_IO_U_PLAT_VAL;
@@ -2158,7 +2159,7 @@ static void __add_log_sample(struct io_log *iolog, union io_sample_data data,
        if (iolog->disabled)
                return;
        if (flist_empty(&iolog->io_logs))
-               iolog->avg_last = t;
+               iolog->avg_last[ddir] = t;
 
        cur_log = get_cur_log(iolog);
        if (cur_log) {
@@ -2289,9 +2290,9 @@ static long add_log_sample(struct thread_data *td, struct io_log *iolog,
         * If period hasn't passed, adding the above sample is all we
         * need to do.
         */
-       this_window = elapsed - iolog->avg_last;
-       if (elapsed < iolog->avg_last)
-               return iolog->avg_last - elapsed;
+       this_window = elapsed - iolog->avg_last[ddir];
+       if (elapsed < iolog->avg_last[ddir])
+               return iolog->avg_last[ddir] - elapsed;
        else if (this_window < iolog->avg_msec) {
                int diff = iolog->avg_msec - this_window;
 
@@ -2299,9 +2300,9 @@ static long add_log_sample(struct thread_data *td, struct io_log *iolog,
                        return diff;
        }
 
-       _add_stat_to_log(iolog, elapsed, td->o.log_max != 0);
+       __add_stat_to_log(iolog, ddir, elapsed, td->o.log_max != 0);
 
-       iolog->avg_last = elapsed - (this_window - iolog->avg_msec);
+       iolog->avg_last[ddir] = elapsed - (this_window - iolog->avg_msec);
        return iolog->avg_msec;
 }