X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=init.c;h=83f3fa0293a05a4efd9f53ea17289c6084bb485b;hp=305f6605f08ab7d749ea415d78a04fa518ba1b03;hb=0717248204729f11d657dc26d2a78a8a40ce0609;hpb=c103f2440db0ceab0eb6c0d6669be285766fb495

diff --git a/init.c b/init.c
index 305f6605..83f3fa02 100644
--- a/init.c
+++ b/init.c
@@ -20,7 +20,7 @@
 #include "filehash.h"
 #include "verify.h"
 
-static char fio_version_string[] = "fio 1.29-rc1";
+static char fio_version_string[] = "fio 1.33.1";
 
 #define FIO_RANDSEED		(0xb1899bedUL)
 
@@ -350,17 +350,13 @@ static int fixup_options(struct thread_data *td)
 	if (td->o.verify != VERIFY_NONE)
 		td->o.refill_buffers = 1;
 
-	if (td->o.pre_read)
+	if (td->o.pre_read) {
 		td->o.invalidate_cache = 0;
-
-	if (td->o.mem_align) {
-		if (td->o.odirect && !is_power_of_2(td->o.mem_align)) {
-			log_err("fio: given IO mem alignment conflicts with"
-					" direct=1. Resetting.\n");
-			td->o.mem_align = page_mask;
-		}
+		if (td->io_ops->flags & FIO_PIPEIO)
+			log_info("fio: cannot pre-read files with an IO engine"
+				 " that isn't seekable. Pre-read disabled.\n");
 	}
-			
+
 	return 0;
 }
 
@@ -533,8 +529,7 @@ static int add_job(struct thread_data *td, const char *jobname, int job_add_num)
 	td->ts.bw_stat[0].min_val = td->ts.bw_stat[1].min_val = ULONG_MAX;
 	td->ddir_nr = td->o.ddir_nr;
 
-	if ((td->o.stonewall || td->o.numjobs > 1 || td->o.new_group)
-	     && prev_group_jobs) {
+	if ((td->o.stonewall || td->o.new_group) && prev_group_jobs) {
 		prev_group_jobs = 0;
 		groupid++;
 	}