X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=filesetup.c;h=612e79474dc4b43c0707d6a43dccf3d98a2f9e8f;hb=91f643461babe7ee83870e28f6b6120d2b52c742;hp=9335dcd3f8dd4b2c38548ee23dbc7e56282caeb0;hpb=82d8de310b1847e3cbd9b4d3f7068cc9f03d533a;p=fio.git

diff --git a/filesetup.c b/filesetup.c
index 9335dcd3..612e7947 100644
--- a/filesetup.c
+++ b/filesetup.c
@@ -235,7 +235,11 @@ static int pre_read_file(struct thread_data *td, struct fio_file *f)
 	unsigned int bs;
 	char *b;
 
-	if (td_ioengine_flagged(td, FIO_PIPEIO))
+	if (td_ioengine_flagged(td, FIO_PIPEIO) ||
+	    td_ioengine_flagged(td, FIO_NOIO))
+		return 0;
+
+	if (f->filetype == FIO_TYPE_CHAR)
 		return 0;
 
 	if (!fio_file_open(f)) {
@@ -1118,10 +1122,11 @@ int pre_read_files(struct thread_data *td)
 	dprint(FD_FILE, "pre_read files\n");
 
 	for_each_file(td, f, i) {
-		pre_read_file(td, f);
+		if (pre_read_file(td, f))
+			return -1;
 	}
 
-	return 1;
+	return 0;
 }
 
 static int __init_rand_distribution(struct thread_data *td, struct fio_file *f)