Message ID | 20200402170603.19649-2-andrzej.p@collabora.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | Better discard support for block devices | expand |
On Thu, Apr 02, 2020 at 07:06:02PM +0200, Andrzej Pietrasiewicz wrote: > From: Evan Green <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: Gwendal Grignou <gwendal@chromium.org> > Reviewed-by: Bart Van Assche <bvanassche@acm.org> > Signed-off-by: Andrzej Pietrasiewicz <andrzej.p@collabora.com> Looks good, Reviewed-by: Christoph Hellwig <hch@lst.de>
diff --git a/drivers/block/loop.c b/drivers/block/loop.c index 739b372a5112..6969be9a855a 100644 --- a/drivers/block/loop.c +++ b/drivers/block/loop.c @@ -461,7 +461,7 @@ 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; + ret = errno_to_blk_status(cmd->ret); goto end_io; } @@ -1953,7 +1953,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); } }