From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E0187C282D9 for ; Thu, 31 Jan 2019 22:13:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B01782087F for ; Thu, 31 Jan 2019 22:13:56 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="PnGGyLG3" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729572AbfAaWNy (ORCPT ); Thu, 31 Jan 2019 17:13:54 -0500 Received: from mail-pg1-f194.google.com ([209.85.215.194]:39392 "EHLO mail-pg1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726994AbfAaWNy (ORCPT ); Thu, 31 Jan 2019 17:13:54 -0500 Received: by mail-pg1-f194.google.com with SMTP id r11so1959362pgp.6 for ; Thu, 31 Jan 2019 14:13:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=8QekRuGAcLl5aXSGWoJ5gf0Ay98dR/uMyx4ny8dqOF0=; b=PnGGyLG30G9OXChzkbiZBAPDLYLUp2jD1tqLc7UMifSYDpSxH1nmZHAl1Rd61nTc5D TRjmUbt9XOZHGepYgsNCbNzd/ssJ/Azp/z7Wm4NYBHI3Z1GdvZMTgjRdD66xd0idVt7n 199dcFNjQ189jg9QLk1D8X1nlV/AQHzo81RRQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=8QekRuGAcLl5aXSGWoJ5gf0Ay98dR/uMyx4ny8dqOF0=; b=dr0mMt4CntUlIsd+uZ+QCa/f4jqmf1AuBTB7+SazahU/uSKSNOuuRunhgyQGp21POB /UqHcY4K/H5IcNDyON3BIeSh7Gj17c7K12tVBiVFnxulkHBwAgUAVLG9DkW3eAOimjsL CWDiQjlaz+LQLST+wGWTSfbbPdQt7dlT69pAOQQ+DKUvvOVyETRh2xssBfJs8TlpQ/FQ dS+PYZQQhVlnlBMpf4yGsYa1bMRkM+6qXoctTlU2Kn7O8BcX6T7HB4m2tl8cqb73K4Ev iOA16XfItN3fUmLBENfKVtugi9nWroIYVRSC2MUi0L0iR4acKQcrmRmwG0xe10vX2Nl6 FvTw== X-Gm-Message-State: AJcUukd2LZkqlYm2juI/nCTCpKmU3ymrhDSNF91aVgSG9bXcAkzYJCNw wSMYGgk4nx1PuQnVWRhZkji/dw== X-Google-Smtp-Source: ALg8bN5Fk25ydTqhauKto3IYej3vobiyCk0NAyBYCBP0hism+OgTySJKVf/2m1ucVvoYILBcEUMRzw== X-Received: by 2002:a62:4641:: with SMTP id t62mr36207932pfa.141.1548972833210; Thu, 31 Jan 2019 14:13:53 -0800 (PST) Received: from evgreen2.mtv.corp.google.com ([2620:15c:202:201:ffda:7716:9afc:1301]) by smtp.gmail.com with ESMTPSA id z10sm7961681pfg.120.2019.01.31.14.13.52 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 31 Jan 2019 14:13:52 -0800 (PST) From: Evan Green To: Jens Axboe Cc: Gwendal Grignou , Martin K Peterson , Alexis Savery , Ming Lei , Evan Green , linux-block@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [RESEND PATCH 1/2] loop: Report EOPNOTSUPP properly Date: Thu, 31 Jan 2019 14:13:27 -0800 Message-Id: <20190131221328.85343-2-evgreen@chromium.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190131221328.85343-1-evgreen@chromium.org> References: <20190131221328.85343-1-evgreen@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- drivers/block/loop.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/drivers/block/loop.c b/drivers/block/loop.c index cf5538942834..a1ba555e3b92 100644 --- a/drivers/block/loop.c +++ b/drivers/block/loop.c @@ -458,8 +458,13 @@ 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) - ret = BLK_STS_IOERR; + if (cmd->ret < 0) { + if (cmd->ret == -EOPNOTSUPP) + ret = BLK_STS_NOTSUPP; + else + ret = BLK_STS_IOERR; + } + goto end_io; } @@ -1878,7 +1883,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); } } -- 2.20.1