From: Jens Axboe <jens.axboe@oracle.com>
Date: Fri, 25 Jan 2008 13:02:15 +0000 (+0100)
Subject: Random IO fixes
X-Git-Tag: fio-1.17.3~1^2
X-Git-Url: https://git.kernel.dk/?p=fio.git;a=commitdiff_plain;h=273f8c912d981439049d9b21aa048aaeaa323c5d

Random IO fixes

Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
---

diff --git a/filesetup.c b/filesetup.c
index 61d21590..f5092202 100644
--- a/filesetup.c
+++ b/filesetup.c
@@ -404,7 +404,7 @@ int setup_files(struct thread_data *td)
 			 */
 			f->io_size = td->o.size / td->o.nr_files;
 			if (!f->io_size)
-				f->io_size = f->real_file_size;
+				f->io_size = f->real_file_size - f->file_offset;
 		} else if (f->real_file_size < td->o.file_size_low ||
 			   f->real_file_size > td->o.file_size_high) {
 			if (f->file_offset > td->o.file_size_low) 
diff --git a/io_u.c b/io_u.c
index 7890a870..a963441a 100644
--- a/io_u.c
+++ b/io_u.c
@@ -118,7 +118,7 @@ static int get_next_rand_offset(struct thread_data *td, struct fio_file *f,
 		/*
 		 * 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;