From 65bdb10a09222d8b5d213de74824be775772ea8f Mon Sep 17 00:00:00 2001 From: Jens Axboe Date: Thu, 24 Jan 2008 13:13:12 +0100 Subject: [PATCH] More file extend fixes Simplify the logic a bit, hope this works... Signed-off-by: Jens Axboe --- filesetup.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/filesetup.c b/filesetup.c index c407d0ef..61d21590 100644 --- a/filesetup.c +++ b/filesetup.c @@ -403,13 +403,8 @@ int setup_files(struct thread_data *td) * zero, set it to the real file size. */ f->io_size = td->o.size / td->o.nr_files; - if ((!f->io_size || f->io_size > f->real_file_size) && - f->real_file_size) { - if (f->file_offset > f->real_file_size) - goto err_offset; - if (f->file_offset) - f->io_size = f->real_file_size - f->file_offset; - } + if (!f->io_size) + f->io_size = f->real_file_size; } 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) @@ -422,9 +417,7 @@ int setup_files(struct thread_data *td) f->io_size = td->o.file_size_low - f->file_offset; else f->io_size = get_rand_file_size(td) - f->file_offset; - } else if (f->file_offset > f->real_file_size) - goto err_offset; - else + } else f->io_size = f->real_file_size - f->file_offset; if (f->io_size == -1ULL) -- 2.25.1