From patchwork Thu Nov 3 17:48:23 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kamal Mostafa X-Patchwork-Id: 690954 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) by ozlabs.org (Postfix) with ESMTP id 3t8ss325Pgz9t1F; Fri, 4 Nov 2016 04:48:39 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1c2M7w-0000fl-00; Thu, 03 Nov 2016 17:48:35 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1c2M7n-0000ej-TA for kernel-team@lists.ubuntu.com; Thu, 03 Nov 2016 17:48:27 +0000 Received: from 1.general.kamal.us.vpn ([10.172.68.52] helo=fourier) by youngberry.canonical.com with esmtpsa (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.76) (envelope-from ) id 1c2M7n-0003ih-Fq for kernel-team@lists.ubuntu.com; Thu, 03 Nov 2016 17:48:27 +0000 Received: from kamal by fourier with local (Exim 4.86_2) (envelope-from ) id 1c2M7l-0003nO-Hm for kernel-team@lists.ubuntu.com; Thu, 03 Nov 2016 10:48:25 -0700 From: Kamal Mostafa To: kernel-team@lists.ubuntu.com Subject: [PATCH 1/2] UBUNTU: SAUCE: hio: set bi_error field to signal an I/O error on a BIO Date: Thu, 3 Nov 2016 10:48:23 -0700 Message-Id: <1478195304-14547-2-git-send-email-kamal@canonical.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1478195304-14547-1-git-send-email-kamal@canonical.com> References: <1478195304-14547-1-git-send-email-kamal@canonical.com> X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.14 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: kernel-team-bounces@lists.ubuntu.com 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 Date: Mon Jul 20 15:29:37 2015 +0200 block: add a bi_error field to struct bio Signed-off-by: Kamal Mostafa Signed-off-by: Leann Ogasawara --- 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 e3d161f..25554c0 100644 --- a/ubuntu/hio/hio.c +++ b/ubuntu/hio/hio.c @@ -61,7 +61,8 @@ #include #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 */