UBUNTU: SAUCE: hio: blk_queue make_request_fn now returns a blk_qc_t

BugLink: http://bugs.launchpad.net/bugs/1603483Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Acked-by: Brad Figg <brad.figg@canonical.com>
Acked-by: Tim Gardner <tim.gardner@canonical.com>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>

ubuntu/hio/hio.c

@@ -8233,10 +8233,12 @@ void ssd_submit_pbio(struct request_queue *q, struct bio *bio)
 	return;
 }
 
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(3,2,0))
-static int ssd_make_request(struct request_queue *q, struct bio *bio)
-#else
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,4,0))
+static blk_qc_t ssd_make_request(struct request_queue *q, struct bio *bio)
+#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(3,2,0))
 static void ssd_make_request(struct request_queue *q, struct bio *bio)
+#else
+static int ssd_make_request(struct request_queue *q, struct bio *bio)
 #endif
 {
 	struct ssd_device *dev = q->queuedata;
@@ -8318,10 +8320,12 @@ static void ssd_make_request(struct request_queue *q, struct bio *bio)
 	}
 
 out:
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(3,2,0))
-	return 0;
-#else
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,4,0))
+	return BLK_QC_T_NONE;
+#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(3,2,0))
 	return;
+#else
+	return 0;
 #endif
 }