From patchwork Tue Mar 17 16:51:06 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrzej Pietrasiewicz X-Patchwork-Id: 11443565 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 8B1681668 for ; Tue, 17 Mar 2020 16:51:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6A5CF2073E for ; Tue, 17 Mar 2020 16:51:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726386AbgCQQvR (ORCPT ); Tue, 17 Mar 2020 12:51:17 -0400 Received: from bhuna.collabora.co.uk ([46.235.227.227]:34734 "EHLO bhuna.collabora.co.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726704AbgCQQvP (ORCPT ); Tue, 17 Mar 2020 12:51:15 -0400 Received: from [127.0.0.1] (localhost [127.0.0.1]) (Authenticated sender: andrzej.p) with ESMTPSA id 0E392295BF1 From: Andrzej Pietrasiewicz To: linux-block@vger.kernel.org Cc: Jens Axboe , kernel@collabora.com, andrzej.p@collabora.com, Evan Green Subject: [PATCH RESEND 1/2] loop: Report EOPNOTSUPP properly Date: Tue, 17 Mar 2020 17:51:06 +0100 Message-Id: <20200317165106.29282-1-andrzej.p@collabora.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200317151111.25749-2-andrzej.p@collabora.com> References: <20200317151111.25749-2-andrzej.p@collabora.com> Sender: linux-block-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org From: Evan Green Properly plumb out EOPNOTSUPP from loop driver operations, which may get returned when for instance a discard operation is attempted but not supported by the underlying block device. Before this change, everything was reported in the log as an I/O error, which is scary and not helpful in debugging. Signed-off-by: Evan Green Reviewed-by: Ming Lei Reviewed-by: Bart Van Assche Reviewed-by: Martin K. Petersen Reviewed-by: Gwendal Grignou Reviewed-by: Chaitanya Kulkarni Signed-off-by: Andrzej Pietrasiewicz --- Add missing S-o-b from me as sender. drivers/block/loop.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/drivers/block/loop.c b/drivers/block/loop.c index 739b372a5112..87307454f768 100644 --- a/drivers/block/loop.c +++ b/drivers/block/loop.c @@ -460,7 +460,9 @@ static void lo_complete_rq(struct request *rq) if (!cmd->use_aio || cmd->ret < 0 || cmd->ret == blk_rq_bytes(rq) || req_op(rq) != REQ_OP_READ) { - if (cmd->ret < 0) + if (cmd->ret == -EOPNOTSUPP) + ret = BLK_STS_NOTSUPP; + else if (cmd->ret < 0) ret = BLK_STS_IOERR; goto end_io; } @@ -1953,7 +1955,10 @@ static void loop_handle_cmd(struct loop_cmd *cmd) failed: /* complete non-aio request */ if (!cmd->use_aio || ret) { - cmd->ret = ret ? -EIO : 0; + if (ret == -EOPNOTSUPP) + cmd->ret = ret; + else + cmd->ret = ret ? -EIO : 0; blk_mq_complete_request(rq); } }