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>

diff --git a/ubuntu/hio/hio.c b/ubuntu/hio/hio.c
index 096d9a1fb86f875f532fdaebdbe896aebafb4261..fe572e4309415703f242836b9dddf27f7d74d85e 100644 (file)
--- 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 */