From: Evan Green <evgreen@chromium.org>
To: Jens Axboe <axboe@kernel.dk>
Cc: Gwendal Grignou <gwendal@chromium.org>,
Alexis Savery <asavery@chromium.org>,
Evan Green <evgreen@chromium.org>,
linux-block@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH 1/2] loop: Report EOPNOTSUPP properly
Date: Tue, 30 Oct 2018 16:06:23 -0700 [thread overview]
Message-ID: <20181030230624.61834-2-evgreen@chromium.org> (raw)
In-Reply-To: <20181030230624.61834-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>
---
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 abad6d15f9563..28990fc94841a 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;
}
@@ -1788,7 +1793,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.16.4
next prev parent reply other threads:[~2018-10-30 23:06 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-30 23:06 [PATCH 0/2] loop: Better discard for block devices Evan Green
2018-10-30 23:06 ` Evan Green [this message]
2018-11-28 1:06 ` [PATCH 1/2] loop: Report EOPNOTSUPP properly Ming Lei
2018-10-30 23:06 ` [PATCH 2/2] loop: Better discard support for block devices Evan Green
2018-11-26 18:53 ` Evan Green
2018-11-27 2:55 ` Ming Lei
2018-11-27 23:34 ` Evan Green
2018-11-28 1:28 ` Ming Lei
2018-11-28 1:26 ` Ming Lei
2018-12-04 22:19 ` Evan Green
2018-12-05 1:10 ` Ming Lei
2018-12-05 19:35 ` Evan Green
2018-12-06 0:22 ` Ming Lei
2018-12-06 3:15 ` Martin K. Petersen
2018-12-10 17:31 ` Evan Green
2018-12-18 23:48 ` Evan Green
2018-10-30 23:50 ` [PATCH 0/2] loop: Better discard " Bart Van Assche
2018-11-01 18:15 ` Evan Green
2018-11-01 22:44 ` Gwendal Grignou
2018-11-02 16:02 ` Bart Van Assche
2018-11-05 20:35 ` 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=20181030230624.61834-2-evgreen@chromium.org \
--to=evgreen@chromium.org \
--cc=asavery@chromium.org \
--cc=axboe@kernel.dk \
--cc=gwendal@chromium.org \
--cc=linux-block@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
/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).