Merge branch 'master' of ssh://router/data/git/fio

diff --combined io_u.c
index 8201ccde751147c85c4b7605b7ef811fae0d6b49,a963441a9d3e6baabf4e312146638d90cb46f708..b8077966a9bac76931cfb63212cd17ef0dd9f8fb
--- 1/io_u.c
--- 2/io_u.c
+++ b/io_u.c
@@@ -118,7 -118,7 +118,7 @@@ static int get_next_rand_offset(struct 
                /*
                 * calculate map offset and chec if it's free
                 */
-               rb = *b + (f->file_offset / td->o.min_bs[ddir]);
+               rb = *b;
                if (random_map_free(td, f, rb))
                        return 0;
  
@@@ -375,7 -375,6 +375,7 @@@ static int fill_io_u(struct thread_dat
         * If using a write iolog, store this entry.
         */
  out:
 +      td->zone_bytes += io_u->buflen;
        log_io_u(td, io_u);
        return 0;
  }
@@@ -766,6 -765,7 +766,6 @@@ static void io_completed(struct thread_
  
                td->io_blocks[idx]++;
                td->io_bytes[idx] += bytes;
 -              td->zone_bytes += bytes;
                td->this_io_bytes[idx] += bytes;
  
                io_u->file->last_completed_pos = io_u->endpos;