From: Evan Green <evgreen@chromium.org>
To: Jens Axboe <axboe@kernel.dk>
Cc: Bart Van Assche <bvanassche@acm.org>,
Gwendal Grignou <gwendal@chromium.org>,
Martin K Petersen <martin.petersen@oracle.com>,
Alexis Savery <asavery@chromium.org>,
Ming Lei <ming.lei@redhat.com>, Evan Green <evgreen@chromium.org>,
linux-block@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH v2 1/2] loop: Report EOPNOTSUPP properly
Date: Thu, 7 Feb 2019 12:57:28 -0800 [thread overview]
Message-ID: <20190207205730.199332-2-evgreen@chromium.org> (raw)
In-Reply-To: <20190207205730.199332-1-evgreen@chromium.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 <evgreen@chromium.org>
Reviewed-by: Ming Lei <ming.lei@redhat.com>
---
Changes in v2:
- Unnested error if statement (Bart)
Ming, I opted to keep your Reviewed-by since the change since v1 was trivial.
Hope that's okay.
---
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 cf5538942834..b6c2d8f3202b 100644
--- a/drivers/block/loop.c
+++ b/drivers/block/loop.c
@@ -458,7 +458,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;
}
@@ -1878,7 +1880,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
next prev parent reply other threads:[~2019-02-07 20:58 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-07 20:57 [PATCH v2 0/2] loop: Better discard for block devices Evan Green
2019-02-07 20:57 ` Evan Green [this message]
2019-02-07 22:11 ` [PATCH v2 1/2] loop: Report EOPNOTSUPP properly Bart Van Assche
2019-02-14 2:31 ` Martin K. Petersen
2019-02-26 19:27 ` Evan Green
2019-02-07 20:57 ` [PATCH v2 2/2] loop: Better discard support for block devices Evan Green
2019-02-14 2:39 ` Martin K. Petersen
2019-02-14 18:00 ` Evan Green
2019-02-26 17:23 ` Evan Green
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190207205730.199332-2-evgreen@chromium.org \
--to=evgreen@chromium.org \
--cc=asavery@chromium.org \
--cc=axboe@kernel.dk \
--cc=bvanassche@acm.org \
--cc=gwendal@chromium.org \
--cc=linux-block@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=martin.petersen@oracle.com \
--cc=ming.lei@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).