Merge branch 'master' into gfio

Conflicts:
	iolog.h
	stat.c

Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --cc Makefile
Simple merge

diff --cc backend.c
index 38efc2307809266d234cfeb183e33bda94b5ea68,9cc8dbc3ce1e029b4729e23e150428e4217b60e4..dcc6fba06fdb58636555cdd1db13d5113cab9b21
--- 1/backend.c
--- 2/backend.c
+++ b/backend.c
@@@ -1597,13 -1586,21 +1598,20 @@@ static void run_threads(void
        }
  
        update_io_ticks();
 -      fio_unpin_memory();
  }
  
+ void wait_for_disk_thread_exit(void)
+ {
+       fio_mutex_down(disk_thread_mutex);
+ }
+ 
  static void *disk_thread_main(void *data)
  {
+       int ret = 0;
+ 
        fio_mutex_up(startup_mutex);
  
-       while (threads) {
+       while (threads && !ret) {
                usleep(DISK_UTIL_MSEC * 1000);
                if (!threads)
                        break;

diff --cc filesetup.c
Simple merge

diff --cc iolog.h
index 0d6b5062999c40480cc1b50de805930b8a14461e,1853846edb7a2c6072e159bd9003a2c3027a6d9a..122a982e0f283fcd47cc4429bc5ca255f285e412
--- 1/iolog.h
--- 2/iolog.h
+++ b/iolog.h
@@@ -119,8 -107,7 +119,7 @@@ extern void add_bw_sample(struct thread
  extern void add_iops_sample(struct thread_data *, enum fio_ddir, struct timeval *);
  extern void init_disk_util(struct thread_data *);
  extern void update_rusage_stat(struct thread_data *);
- extern void update_io_ticks(void);
 -extern void setup_log(struct io_log **, unsigned long);
 +extern void setup_log(struct io_log **, unsigned long, int);
  extern void finish_log(struct thread_data *, struct io_log *, const char *);
  extern void finish_log_named(struct thread_data *, struct io_log *, const char *, const char *);
  extern void __finish_log(struct io_log *, const char *);

diff --cc stat.c
index ee495ffd88dc5dae82f92717deda18e59ef8bd57,0a0479814825c7a5c6eaf09985bc8eb9b15b496c..ef447b163d6e72bf74c55f181064693411d7b554
--- 1/stat.c
--- 2/stat.c
+++ b/stat.c
@@@ -485,7 -521,11 +485,10 @@@ void show_thread_status(struct thread_s
        double usr_cpu, sys_cpu;
        unsigned long runtime;
        double io_u_dist[FIO_IO_U_MAP_NR];
 -      double io_u_lat_u[FIO_IO_U_LAT_U_NR];
 -      double io_u_lat_m[FIO_IO_U_LAT_M_NR];
+       time_t time_p;
+       char time_buf[64];
+ 
 +
        if (!(ts->io_bytes[0] + ts->io_bytes[1]) &&
            !(ts->total_io_u[0] + ts->total_io_u[1]))
                return;