From: Jens Axboe <axboe@fb.com>
Date: Sun, 30 Apr 2017 22:49:22 +0000 (-0600)
Subject: Merge branch 'zero_ioengine_flags' of https://github.com/sitsofe/fio
X-Git-Tag: fio-2.20~25
X-Git-Url: https://git.kernel.dk/?p=fio.git;a=commitdiff_plain;h=2ef124c6e619a7e53954ccaa3c800a6196386f25;hp=c08d28cbba96a63928f3dc05bb57d3cde9529ef6

Merge branch 'zero_ioengine_flags' of https://github.com/sitsofe/fio
---

diff --git a/fio.h b/fio.h
index 6b2b669d..e11a0390 100644
--- a/fio.h
+++ b/fio.h
@@ -596,7 +596,8 @@ static inline enum fio_ioengine_flags td_ioengine_flags(struct thread_data *td)
 
 static inline void td_set_ioengine_flags(struct thread_data *td)
 {
-	td->flags |= (td->io_ops->flags << TD_ENG_FLAG_SHIFT);
+	td->flags = (~(TD_ENG_FLAG_MASK << TD_ENG_FLAG_SHIFT) & td->flags) |
+		    (td->io_ops->flags << TD_ENG_FLAG_SHIFT);
 }
 
 static inline bool td_ioengine_flagged(struct thread_data *td,