X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=io_u.c;h=b0f43557d509ff1201f77e953883a4ca1562ec09;hp=31d3b14be50d0e124a8de277245cc043f4d1c624;hb=5a7c56804dafab5770797044a4f1d259fe708dfb;hpb=7bb48f84ac78cac1f90e3e04d0220d90d6a64a6b

diff --git a/io_u.c b/io_u.c
index 31d3b14b..b0f43557 100644
--- a/io_u.c
+++ b/io_u.c
@@ -142,8 +142,12 @@ static int get_next_offset(struct thread_data *td, struct io_u *io_u)
 
 		if (get_next_rand_offset(td, f, ddir, &b))
 			return 1;
-	} else
+	} else {
+		if (f->last_pos >= f->real_file_size)
+			return 1;
+
 		b = f->last_pos / td->o.min_bs[ddir];
+	}
 
 	io_u->offset = (b * td->o.min_bs[ddir]) + f->file_offset;
 	if (io_u->offset >= f->real_file_size)
@@ -168,19 +172,6 @@ static unsigned int get_next_buflen(struct thread_data *td, struct io_u *io_u)
 			buflen = (buflen + td->o.min_bs[ddir] - 1) & ~(td->o.min_bs[ddir] - 1);
 	}
 
-	while (buflen + io_u->offset > f->real_file_size) {
-		if (buflen == td->o.min_bs[ddir]) {
-			if (!td->o.odirect) {
-				assert(io_u->offset <= f->real_file_size);
-				buflen = f->real_file_size - io_u->offset;
-				return buflen;
-			}
-			return 0;
-		}
-
-		buflen = td->o.min_bs[ddir];
-	}
-
 	return buflen;
 }
 
@@ -418,6 +409,8 @@ static struct fio_file *get_next_file_rand(struct thread_data *td, int goodf,
 
 		fno = (unsigned int) ((double) td->o.nr_files * (r / (RAND_MAX + 1.0)));
 		f = &td->files[fno];
+		if (f->flags & FIO_FILE_DONE)
+			continue;
 
 		if ((!goodf || (f->flags & goodf)) && !(f->flags & badf))
 			return f;
@@ -440,6 +433,11 @@ static struct fio_file *get_next_file_rr(struct thread_data *td, int goodf,
 		if (td->next_file >= td->o.nr_files)
 			td->next_file = 0;
 
+		if (f->flags & FIO_FILE_DONE) {
+			f = NULL;
+			continue;
+		}
+
 		if ((!goodf || (f->flags & goodf)) && !(f->flags & badf))
 			break;
 
@@ -550,6 +548,7 @@ set_file:
 		 */
 		io_u->file = NULL;
 		td_io_close_file(td, f);
+		f->flags |= FIO_FILE_DONE;
 
 		/*
 		 * probably not the right place to do this, but see
@@ -572,15 +571,6 @@ set_file:
 		f->last_pos += td->o.zone_skip;
 	}
 
-	if (io_u->buflen + io_u->offset > f->real_file_size) {
-		if (td->io_ops->flags & FIO_RAWIO) {
-			put_io_u(td, io_u);
-			return NULL;
-		}
-
-		io_u->buflen = f->real_file_size - io_u->offset;
-	}
-
 	if (io_u->ddir != DDIR_SYNC) {
 		if (!io_u->buflen) {
 			put_io_u(td, io_u);