From a08ff3a25553e7e9b99fce6b131e917c14421218 Mon Sep 17 00:00:00 2001
From: Thomas Schoebel-Theuer <tst@1und1.de>
Date: Mon, 30 Nov 2015 09:25:16 +0100
Subject: [PATCH] if: adapt to changes, use blk_queue_split()

---
 kernel/mars_if.c | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/kernel/mars_if.c b/kernel/mars_if.c
index 188e201f..8c66ced6 100644
--- a/kernel/mars_if.c
+++ b/kernel/mars_if.c
@@ -72,9 +72,13 @@
 #ifdef __bvec_iter_bvec
 #define HAS_BVEC_ITER
 #endif
-/* adaptation to 4246a0b63bd8f56a1469b12eafeb875b1041a451 and 8ae126660fddbeebb9251a174e6fa45b6ad8f932 */
+/* adaptation to 4246a0b63bd8f56a1469b12eafeb875b1041a451 */
 #ifndef bio_io_error
 #define HAS_BI_ERROR
+#endif
+/* adaptation to 54efd50bfd873e2dbf784e0b21a8027ba4299a3e and 8ae126660fddbeebb9251a174e6fa45b6ad8f932 */
+#ifdef HAS_BI_ERROR
+#define USE_BLK_QUEUE_SPLIT
 #undef USE_MERGE_BVEC
 #endif
 
@@ -396,6 +400,15 @@ void if_make_request(struct request_queue *q, struct bio *bio)
 
 	might_sleep();
 
+//      remove_this
+#ifdef USE_BLK_QUEUE_SPLIT
+#warning USE_BLK_QUEUE_SPLIT
+//      end_remove_this
+	blk_queue_split(q, &bio, q->bio_split);
+//      remove_this
+#endif
+//      end_remove_this
+
 	if (unlikely(!sectors)) {
 		_if_unplug(input);
 		/* THINK: usually this happens only at write barriers.