From: Jens Axboe <axboe@suse.de>
Date: Fri, 5 May 2006 09:11:22 +0000 (+0200)
Subject: [PATCH] Update version string, fix offset bug
X-Git-Tag: fio-1.3^0
X-Git-Url: https://git.kernel.dk/?p=fio.git;a=commitdiff_plain;h=e8e387c14948e0a038660e69ace4efa13cdfd3af;hp=6a0106a0ffb486d19ba8c1796b436c8ecdf64ed6

[PATCH] Update version string, fix offset bug
---

diff --git a/fio-ini.c b/fio-ini.c
index c9406227..611bdca8 100644
--- a/fio-ini.c
+++ b/fio-ini.c
@@ -37,7 +37,7 @@
 #define DEF_ZONE_SIZE		(0)
 #define DEF_ZONE_SKIP		(0)
 
-static char fio_version_string[] = "fio 1.1";
+static char fio_version_string[] = "fio 1.3";
 
 static int repeatable = DEF_RAND_REPEAT;
 static char *ini_file;
diff --git a/fio.c b/fio.c
index e42c6795..34e8f596 100644
--- a/fio.c
+++ b/fio.c
@@ -1209,6 +1209,7 @@ static int file_size(struct thread_data *td)
 	if (!td->file_size || td->file_size > td->real_file_size)
 		td->file_size = td->real_file_size;
 
+	td->file_size -= td->file_offset;
 	return 0;
 }
 
@@ -1231,6 +1232,7 @@ static int bdev_size(struct thread_data *td)
 	if (!td->file_size || td->file_size > td->real_file_size)
 		td->file_size = td->real_file_size;
 
+	td->file_size -= td->file_offset;
 	return 0;
 }
 
@@ -1248,8 +1250,8 @@ static int get_file_size(struct thread_data *td)
 	if (ret)
 		return ret;
 
-	if (td->file_offset + td->file_size > td->real_file_size) {
-		fprintf(stderr, "Client%d: offset extends end (%Lu > %Lu)\n", td->thread_number, td->file_offset + td->file_size, td->real_file_size);
+	if (td->file_offset > td->real_file_size) {
+		fprintf(stderr, "Client%d: offset extends end (%Lu > %Lu)\n", td->thread_number, td->file_offset, td->real_file_size);
 		return 1;
 	}