From bab7ba63005fce4dc66bf23518102675d659f859 Mon Sep 17 00:00:00 2001
From: Thomas Schoebel-Theuer <tst@1und1.de>
Date: Wed, 18 Nov 2015 15:16:07 +0100
Subject: [PATCH] if: adapt to kernel 4.4 BLK_QC_T_NONE

see dece16353ef47d8d33f5302bc158072a9d65e26f
---
 kernel/mars_if.c | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/kernel/mars_if.c b/kernel/mars_if.c
index a866b5a9..ae854716 100644
--- a/kernel/mars_if.c
+++ b/kernel/mars_if.c
@@ -339,12 +339,17 @@ void if_timer(unsigned long data)
 /* accept a linux bio, convert to mref and call buf_io() on it.
  */
 static
-#ifdef BIO_CPU_AFFINE
-int
+//      remove_this
+/* see dece16353ef47d8d33f5302bc158072a9d65e26f */
+#ifdef BLK_QC_T_NONE
+//      end_remove_this
+blk_qc_t if_make_request(struct request_queue *q, struct bio *bio)
+//      remove_this
+#elif defined(BIO_CPU_AFFINE)
+int if_make_request(struct request_queue *q, struct bio *bio)
 #else
-void
+void if_make_request(struct request_queue *q, struct bio *bio)
 #endif
-if_make_request(struct request_queue *q, struct bio *bio)
 {
 	struct if_input *input = q->queuedata;
 	struct if_brick *brick = input->brick;
@@ -784,7 +789,13 @@ err:
 done:
 	remove_binding_from(brick->say_channel, current);
 
-#ifdef BIO_CPU_AFFINE
+//      remove_this
+/* see dece16353ef47d8d33f5302bc158072a9d65e26f */
+#ifdef BLK_QC_T_NONE
+//      end_remove_this
+	return BLK_QC_T_NONE;
+//      remove_this
+#elif defined(BIO_CPU_AFFINE)
 	return error;
 #else
 	return;