X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=filesetup.c;h=d79fc61081278c934fd1c4aecbfe344666c75811;hp=f0c42e896de1afc336888f949045b8b493087c61;hb=c97d8369f04e562383f50a77a2b0e2abb102df75;hpb=d424d4dd657eaf4aeb8ffb07a550a5f64940f41a

diff --git a/filesetup.c b/filesetup.c
index f0c42e89..d79fc610 100644
--- a/filesetup.c
+++ b/filesetup.c
@@ -209,6 +209,12 @@ int generic_open_file(struct thread_data *td, struct fio_file *f)
 			return 1;
 		}
 		is_std = 1;
+
+		/*
+		 * move output logging to stderr, if we are writing to stdout
+		 */
+		if (td_write(td))
+			f_out = stderr;
 	}
 
 	if (td->o.odirect)
@@ -216,7 +222,7 @@ int generic_open_file(struct thread_data *td, struct fio_file *f)
 	if (td->o.sync_io)
 		flags |= O_SYNC;
 
-	if (td_write(td) || td_rw(td)) {
+	if (td_write(td)) {
 		flags |= O_RDWR;
 
 		if (f->filetype == FIO_TYPE_FILE)
@@ -468,8 +474,7 @@ void close_files(struct thread_data *td)
 	unsigned int i;
 
 	for_each_file(td, f, i) {
-		if ((f->flags & FIO_FILE_UNLINK) &&
-		    f->filetype == FIO_TYPE_FILE)
+		if (td->o.unlink && f->filetype == FIO_TYPE_FILE)
 			unlink(f->file_name);
 
 		td_io_close_file(td, f);