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

BugLink: http://bugs.launchpad.net/bugs/1635594
Signed-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>
BugLink: http://bugs.launchpad.net/bugs/1635594
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Acked-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Acked-by: Stefan Bader <stefan.bader@canonical.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

diff --git a/ubuntu/hio/hio.c b/ubuntu/hio/hio.c
index 708fe954ad0a1601fa2a8be3409cd0fc0d8c8594..c74c2ee30a97a1bd7f5bf11539b69664b4f80c87 100644 (file)
--- a/ubuntu/hio/hio.c
+++ b/ubuntu/hio/hio.c
@@ -8233,10 +8233,12 @@ out:
        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
 }