[Drbd-dev] [PATCH-drbd9 1/2] compat: blk_queue_flush() is replaced

[Nick Wang]

In v4.7(fe8fb75e), blk_queue_flush() switch to use
blk_queue_write_cache().

Signed-off-by: Nick Wang <nwang at suse.com>

CC: Philipp Reisner <philipp.reisner at linbit.com>
CC: Lars Ellenberg <lars.ellenberg at linbit.com>
CC: drbd-dev at lists.linbit.com
---
 drbd_wrappers.h              | 4 ++++
 tests/have_blk_queue_flush.c | 6 ++++++
 2 files changed, 10 insertions(+)
 create mode 100644 tests/have_blk_queue_flush.c

diff --git a/drbd_wrappers.h b/drbd_wrappers.h
index 0f55d9c..2dcf6cd 100644
--- a/drbd_wrappers.h
+++ b/drbd_wrappers.h
@@ -677,6 +677,10 @@ static inline void blk_queue_max_hw_sectors(struct request_queue *q, unsigned in
 #define blk_queue_max_hw_sectors(q, max)	blk_queue_max_sectors(q, max)
 #endif
 
+#ifndef COMPAT_HAVE_BLK_QUEUE_FLUSH
+#define blk_queue_flush(q, f)	blk_queue_write_cache(q, true, true)
+#endif
+
 #ifndef COMPAT_HAVE_BLK_QUEUE_MAX_SEGMENTS
 static inline void blk_queue_max_segments(struct request_queue *q, unsigned short max_segments)
 {
diff --git a/tests/have_blk_queue_flush.c b/tests/have_blk_queue_flush.c
new file mode 100644
index 0000000..a730dee
--- /dev/null
+++ b/tests/have_blk_queue_flush.c
@@ -0,0 +1,6 @@
+#include <linux/blkdev.h>
+
+void dummy(struct request_queue *q, unsigned int flush)
+{
+	blk_queue_flush(q, flush);
+}
-- 
1.8.5.6