From patchwork Fri Jul 21 17:11:10 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Bart Van Assche X-Patchwork-Id: 9857367 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 6AC3260392 for ; Fri, 21 Jul 2017 17:13:53 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4F25528658 for ; Fri, 21 Jul 2017 17:13:53 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 40A7F28670; Fri, 21 Jul 2017 17:13:53 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id A14EE28658 for ; Fri, 21 Jul 2017 17:13:52 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dYbSZ-0007RS-FH; Fri, 21 Jul 2017 17:11:27 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dYbSY-0007RK-Sg for xen-devel@lists.xenproject.org; Fri, 21 Jul 2017 17:11:26 +0000 Received: from [85.158.137.68] by server-12.bemta-3.messagelabs.com id 86/08-01862-EB532795; Fri, 21 Jul 2017 17:11:26 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrEIsWRWlGSWpSXmKPExsUS4LxSWHevaVG kwYSbshbft0xmcmD0OPzhCksAYxRrZl5SfkUCa8avDz3sBQ3CFWunPWRtYDwn0MXIxSEk8IVR 4nnHXGYI5ySjxNTmlaxdjJxAzmJGiSePtUFsNgE9iVPz9jGB2CICChI9v1eygTQwC0xhkmh9c pq9i5GDQ1jAXeLRjCQQk0VAVeLIpACQcl4BS4n7e0+AtUoI6EscnTqfGSIuKHFy5hMWkHJmAX WJ9fOEQMLMAvISzVtnM09g5J2FpGoWQtUsJFULGJlXMWoUpxaVpRbpGhnoJRVlpmeU5CZm5ug aGhjr5aYWFyemp+YkJhXrJefnbmIEhlQ9AwPjDsbmE36HGCU5mJREee+uK4wU4kvKT6nMSCzO iC8qzUktPsQow8GhJMGrZVIUKSRYlJqeWpGWmQMMbpi0BAePkgivPkiat7ggMbc4Mx0idYrRm GPD6vVfmDheTfj/jUmIJS8/L1VKnFcTpFQApDSjNA9uECzqLjHKSgnzMjIwMAjxFKQW5WaWoM q/YhTnYFQS5nUHmcKTmVcCt+8V0ClMQKc8cisAOaUkESEl1cDY9PmkeGVT7yQp0+Q19cdrmc/ b866t6q1Iu+6T6yK3VVDsjfj2Fa9nredLln6p83Jbu8ZtTxOTTD7HIu1IHrUkhi8Jr2267+0v 8euqLVz2wd7h8k+70G0JU/c77d7hslKXfcbzLbd1tufMu7Xoy52//d8Dsybsb3Hku+h1dLFoz c4fTPPfbbqpxFKckWioxVxUnAgA7/DV97UCAAA= X-Env-Sender: bart@gcc10.fsffrance.org X-Msg-Ref: server-6.tower-31.messagelabs.com!1500657085!68008924!1 X-Originating-IP: [80.67.169.19] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 9.4.25; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3935 invoked from network); 21 Jul 2017 17:11:25 -0000 Received: from solo.fdn.fr (HELO solo.fdn.fr) (80.67.169.19) by server-6.tower-31.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 21 Jul 2017 17:11:25 -0000 Received: from gcc11.fsffrance.org (unknown [86.65.39.10]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by smtp.fdn.fr (Postfix) with ESMTPS id AE68BD0A0C; Fri, 21 Jul 2017 19:11:24 +0200 (CEST) Received: from [10.73.37.169] (helo=gcc10.fsffrance.org) by gcc11.fsffrance.org with esmtp (Exim 4.69) (envelope-from ) id 1dYbSW-000549-Fb; Fri, 21 Jul 2017 19:11:24 +0200 Received: from bart by gcc10.fsffrance.org with local (Exim 4.72) (envelope-from ) id 1dYbSI-0000E0-TU; Fri, 21 Jul 2017 19:11:10 +0200 From: Bart Van Assche To: Jens Axboe Date: Fri, 21 Jul 2017 19:11:10 +0200 Message-Id: <20170721171110.824-1-bart.vanassche@wdc.com> X-Mailer: git-send-email 2.14.0.rc0.26.g981adb9 MIME-Version: 1.0 Cc: stable@vger.kernel.org, linux-block@vger.kernel.org, Bart Van Assche , xen-devel@lists.xenproject.org, Christoph Hellwig , =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= Subject: [Xen-devel] [PATCH] xen-blkfront: Fix handling of non-supported operations X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP This patch fixes the following sparse warnings: drivers/block/xen-blkfront.c:916:45: warning: incorrect type in argument 2 (different base types) drivers/block/xen-blkfront.c:916:45: expected restricted blk_status_t [usertype] error drivers/block/xen-blkfront.c:916:45: got int [signed] error drivers/block/xen-blkfront.c:1599:47: warning: incorrect type in assignment (different base types) drivers/block/xen-blkfront.c:1599:47: expected int [signed] error drivers/block/xen-blkfront.c:1599:47: got restricted blk_status_t [usertype] drivers/block/xen-blkfront.c:1607:55: warning: incorrect type in assignment (different base types) drivers/block/xen-blkfront.c:1607:55: expected int [signed] error drivers/block/xen-blkfront.c:1607:55: got restricted blk_status_t [usertype] drivers/block/xen-blkfront.c:1625:55: warning: incorrect type in assignment (different base types) drivers/block/xen-blkfront.c:1625:55: expected int [signed] error drivers/block/xen-blkfront.c:1625:55: got restricted blk_status_t [usertype] drivers/block/xen-blkfront.c:1628:62: warning: restricted blk_status_t degrades to integer Compile-tested only. Fixes: commit 2a842acab109 ("block: introduce new block status code type") Signed-off-by: Bart Van Assche Cc: Christoph Hellwig Cc: Konrad Rzeszutek Wilk Cc: Roger Pau Monné Cc: Cc: Reviewed-by: Christoph Hellwig --- drivers/block/xen-blkfront.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/block/xen-blkfront.c b/drivers/block/xen-blkfront.c index c852ed3c01d5..1799bba74390 100644 --- a/drivers/block/xen-blkfront.c +++ b/drivers/block/xen-blkfront.c @@ -111,7 +111,7 @@ struct blk_shadow { }; struct blkif_req { - int error; + blk_status_t error; }; static inline struct blkif_req *blkif_req(struct request *rq) @@ -1616,7 +1616,7 @@ static irqreturn_t blkif_interrupt(int irq, void *dev_id) if (unlikely(bret->status == BLKIF_RSP_EOPNOTSUPP)) { printk(KERN_WARNING "blkfront: %s: %s op failed\n", info->gd->disk_name, op_name(bret->operation)); - blkif_req(req)->error = -EOPNOTSUPP; + blkif_req(req)->error = BLK_STS_NOTSUPP; } if (unlikely(bret->status == BLKIF_RSP_ERROR && rinfo->shadow[id].req.u.rw.nr_segments == 0)) {