From: Jens Axboe <axboe@fb.com>
Date: Tue, 9 Dec 2014 20:59:58 +0000 (-0700)
Subject: Always scramble buffers, if scramble_buffers is set
X-Git-Tag: fio-2.2.0~28
X-Git-Url: https://git.kernel.dk/?p=fio.git;a=commitdiff_plain;h=1bf2498d311155bc4eb43edb4e6d3a04845d94c5

Always scramble buffers, if scramble_buffers is set

This makes scramble_buffers and zero_buffers cooperate nicely.

Signed-off-by: Jens Axboe <axboe@fb.com>
---

diff --git a/init.c b/init.c
index 9fbc477f..f606087e 100644
--- a/init.c
+++ b/init.c
@@ -926,7 +926,13 @@ static void init_flags(struct thread_data *td)
 		td->flags |= TD_F_READ_IOLOG;
 	if (o->refill_buffers)
 		td->flags |= TD_F_REFILL_BUFFERS;
-	if (o->scramble_buffers)
+	/*
+	 * Scramble by default, but not if zero_buffer is true and has been
+	 * set. But if scramble_buffers has been set, always scramble.
+	 */
+	if (o->scramble_buffers && ((!o->zero_buffers &&
+	    fio_option_is_set(o, zero_buffers)) ||
+	    fio_option_is_set(o, scramble_buffers)))
 		td->flags |= TD_F_SCRAMBLE_BUFFERS;
 	if (o->verify != VERIFY_NONE)
 		td->flags |= TD_F_VER_NONE;