524400d0e7
bsc#983633, upgrade to ver9.0.2 to build against kernel 4.6/4.7-rc2 OBS-URL: https://build.opensuse.org/request/show/401378 OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/drbd?expand=0&rev=34
25 lines
1.2 KiB
Diff
25 lines
1.2 KiB
Diff
diff -Naur drbd-9.0.2+git.14d2eea.orig/drbd/drbd-kernel-compat/drbd_wrappers.h drbd-9.0.2+git.14d2eea/drbd/drbd-kernel-compat/drbd_wrappers.h
|
|
--- drbd-9.0.2+git.14d2eea.orig/drbd/drbd-kernel-compat/drbd_wrappers.h 2016-06-08 17:52:23.920376490 +0800
|
|
+++ drbd-9.0.2+git.14d2eea/drbd/drbd-kernel-compat/drbd_wrappers.h 2016-06-08 21:14:33.692708703 +0800
|
|
@@ -677,6 +677,10 @@
|
|
#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 -Naur drbd-9.0.2+git.14d2eea.orig/drbd/drbd-kernel-compat/tests/have_blk_queue_flush.c drbd-9.0.2+git.14d2eea/drbd/drbd-kernel-compat/tests/have_blk_queue_flush.c
|
|
--- drbd-9.0.2+git.14d2eea.orig/drbd/drbd-kernel-compat/tests/have_blk_queue_flush.c 1970-01-01 08:00:00.000000000 +0800
|
|
+++ drbd-9.0.2+git.14d2eea/drbd/drbd-kernel-compat/tests/have_blk_queue_flush.c 2016-06-08 21:13:40.324918430 +0800
|
|
@@ -0,0 +1,6 @@
|
|
+#include <linux/blkdev.h>
|
|
+
|
|
+void dummy(struct request_queue *q, unsigned int flush)
|
|
+{
|
|
+ blk_queue_flush(q, flush);
|
|
+}
|