[PATCH] Fix offset/size setting problem
Add ->real_file_size, as ->file_size is the io size. Otherwise we don't
know if an offset + size is valid. This fixes the bug of offset >= size,
if size is set smaller than the device/file size.
diff --git a/fio.c b/fio.c
index ccceaa5..2fb7da9 100644
--- a/fio.c
+++ b/fio.c
@@ -302,7 +302,7 @@
b = td->last_pos / td->min_bs;
*offset = (b * td->min_bs) + td->file_offset;
- if (*offset > td->file_size)
+ if (*offset > td->real_file_size)
return 1;
return 0;
@@ -628,8 +628,8 @@
return NULL;
}
- if (io_u->buflen + io_u->offset > td->file_size)
- io_u->buflen = td->file_size - io_u->offset;
+ if (io_u->buflen + io_u->offset > td->real_file_size)
+ io_u->buflen = td->real_file_size - io_u->offset;
if (!io_u->buflen) {
put_io_u(td, io_u);
@@ -1203,8 +1203,10 @@
return 1;
}
- if (!td->file_size)
- td->file_size = st.st_size;
+ td->real_file_size = st.st_size;
+
+ if (!td->file_size || td->file_size > td->real_file_size)
+ td->file_size = td->real_file_size;
return 0;
}
@@ -1220,11 +1222,13 @@
return 1;
}
+ td->real_file_size = bytes;
+
/*
* no extend possibilities, so limit size to device size if too large
*/
- if (!td->file_size || td->file_size > bytes)
- td->file_size = bytes;
+ if (!td->file_size || td->file_size > td->real_file_size)
+ td->file_size = td->real_file_size;
return 0;
}
@@ -1241,12 +1245,12 @@
if (ret)
return ret;
- if (td->file_offset > td->file_size) {
- fprintf(stderr, "Client%d: offset larger than length (%Lu > %Lu)\n", td->thread_number, td->file_offset, td->file_size);
+ 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);
return 1;
}
- td->io_size = td->file_size - td->file_offset;
+ td->io_size = td->file_size;
if (td->io_size == 0) {
fprintf(stderr, "Client%d: no io blocks\n", td->thread_number);
td_verror(td, EINVAL);