From: Kamal Mostafa <kamal@canonical.com>
Date: Wed, 2 Nov 2016 19:35:15 +0000 (-0700)
Subject: UBUNTU: SAUCE: hio: set bi_error field to signal an I/O error on a BIO
X-Git-Tag: Ubuntu-4.10.0-9.11~230
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=ce6eecadd37815478f1c4e489f9767b2aede9797;p=mirror_ubuntu-zesty-kernel.git

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 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 */