From e9e884e4e4c74c783c6095649f26b2fa733a75ec Mon Sep 17 00:00:00 2001
From: Kamal Mostafa <kamal@canonical.com>
Date: Wed, 2 Nov 2016 12:35:15 -0700
Subject: [PATCH] UBUNTU: SAUCE: hio: set bi_error field to signal an I/O error
 on a BIO

BugLink: http://bugs.launchpad.net/bugs/1638700

The hio driver needs to accommodate handling the following which was
introduced in 4.3-rc1:

  commit 4246a0b63bd8f56a1469b12eafeb875b1041a451
  Author: Christoph Hellwig <hch@lst.de>
  Date:   Mon Jul 20 15:29:37 2015 +0200

    block: add a bi_error field to struct bio

Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Acked-by: Tim Gardner <tim.gardner@canonical.com>
Acked-by: Seth Forshee <seth.forshee@canonical.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
---
 ubuntu/hio/hio.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ubuntu/hio/hio.c b/ubuntu/hio/hio.c
index 096d9a1fb86f..fe572e430941 100644
--- a/ubuntu/hio/hio.c
+++ b/ubuntu/hio/hio.c
@@ -61,7 +61,8 @@
 #include <linux/devfs_fs_kernel.h>
 #endif
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,3,0))
-#define bio_endio(bio, errors) bio_endio(bio)
+#define bio_endio(bio, errors)	\
+	do { bio->bi_error = errors; bio_endio(bio); } while (0)
 #endif
 
 /* driver */
-- 
2.39.5