Merge branch 'master' of https://github.com/SuhoSon/fio

* 'master' of https://github.com/SuhoSon/fio:
  thinktime: Fix missing re-init thinktime when using ramptime

diff --combined fio.h
index f2acd4302b39a3c82cb314643e8dbe8c73d67ed8,7e90175af8d1e1fbcdf65b4dc220857f19bed128..6b841e9c263bf1b1960d00b551d78e7ebb986467
--- 1/fio.h
--- 2/fio.h
+++ b/fio.h
@@@ -163,7 -163,6 +163,7 @@@ enum 
        F_ADV_TYPE,
        F_ADV_RANDOM,
        F_ADV_SEQUENTIAL,
 +      F_ADV_NOREUSE,
  };
  
  /*
@@@ -377,7 -376,7 +377,7 @@@ struct thread_data 
  
        uint64_t *thinktime_blocks_counter;
        struct timespec last_thinktime;
-       uint64_t last_thinktime_blocks;
+       int64_t last_thinktime_blocks;
  
        /*
         * State for random io, a bitmap of blocks done vs not done