Merge branch 'winfio'

diff --combined log.c
index d4850a5290c6d375caba0fd019f70d4b77cf5236,1ac2e35345b91a4e691c66d0f68924adc609b428..f962864d912d9b5cdc3bfbc39286241fdd717665
--- 1/log.c
--- 2/log.c
+++ b/log.c
@@@ -415,7 -415,6 +415,7 @@@ static int init_iolog_read(struct threa
        if (!p) {
                td_verror(td, errno, "iolog read");
                log_err("fio: unable to read iolog\n");
 +              fclose(f);
                return 1;
        }
  
@@@ -435,7 -434,7 +435,7 @@@
  }
  
  /*
-  * Setup a log for storing io patterns.
+  * Set up a log for storing io patterns.
   */
  static int init_iolog_write(struct thread_data *td)
  {