From: Jens Axboe <axboe@kernel.dk>
Date: Tue, 25 Sep 2012 17:51:04 +0000 (+0200)
Subject: Merge branch 'master' into gfio
X-Git-Tag: fio-2.1~57^2~49
X-Git-Url: https://git.kernel.dk/?p=fio.git;a=commitdiff_plain;h=de26d51f3e909997c9a500bf9f15a1bd5c18bb49;hp=0950e832e5f2ef92fbfad92c8a9d20480e3b13f9

Merge branch 'master' into gfio
---

diff --git a/backend.c b/backend.c
index 6f400387..586eac87 100644
--- a/backend.c
+++ b/backend.c
@@ -812,7 +812,7 @@ static int init_io_u(struct thread_data *td)
 	td->orig_buffer_size = (unsigned long long) max_bs
 					* (unsigned long long) max_units;
 
-	if ((td->io_ops->flags & FIO_NOIO) || !td_rw(td))
+	if ((td->io_ops->flags & FIO_NOIO) || !(td_read(td) || td_write(td)))
 		data_xfer = 0;
 
 	if (td->o.mem_type == MEM_SHMHUGE || td->o.mem_type == MEM_MMAPHUGE) {