UBUNTU: SAUCE: hio: Build fixes for 4.13

Signed-off-by: Seth Forshee <seth.forshee@canonical.com>

diff --git a/ubuntu/hio/hio.c b/ubuntu/hio/hio.c
index 2021b884d69638a732c21977fd0562913ba1ae7f..dd323e76bde64ff02c93b8dd0c78504e38f6d2eb 100644 (file)
--- a/ubuntu/hio/hio.c
+++ b/ubuntu/hio/hio.c
@@ -2097,7 +2097,11 @@ MODULE_PARM_DESC(finject, "enable fault simulation, 0 - off, 1 - on, for debug p
 static inline void ssd_bio_endio(struct bio *bio, int error)
 {
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,4,0))
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(4,13,0))
        bio->bi_error = error;
+#else
+       bio->bi_status = errno_to_blk_status(error);
+#endif
        bio_endio(bio);
 #elif (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24))
        bio_endio(bio, error);
@@ -8457,7 +8461,9 @@ static int ssd_make_request(struct request_queue *q, struct bio *bio)
                goto out;
        }
 
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,3,0))
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,13,0))
+       blk_queue_split(q, &bio);
+#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(4,3,0))
        blk_queue_split(q, &bio, q->bio_split);
 #endif