aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/hack-4.19/550-loop-Report-EOPNOTSUPP-properly.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2020-01-04 23:45:20 +0100
committerHauke Mehrtens <hauke@hauke-m.de>2020-01-05 00:43:36 +0100
commitb6cdc042af3451c82562a3310fd8f70b925b475f (patch)
tree6c96b539e4a4831517f96383c62f5aea9fd44d95 /target/linux/generic/hack-4.19/550-loop-Report-EOPNOTSUPP-properly.patch
parent1bb90a28e47ce7cf3ae76f46b43a6f5e0da2a055 (diff)
downloadupstream-b6cdc042af3451c82562a3310fd8f70b925b475f.tar.gz
upstream-b6cdc042af3451c82562a3310fd8f70b925b475f.tar.bz2
upstream-b6cdc042af3451c82562a3310fd8f70b925b475f.zip
kernel: bump 4.19 to 4.19.93
Refreshed all patches. The patch hack-4.19/550-loop-better-discard-for-block-devices.patch was replaced with an new version of the patch from: https://lore.kernel.org/patchwork/patch/1153625/ https://lore.kernel.org/patchwork/patch/1153626/ Compile-tested on: ipq40xx, lantiq Runtime-tested on: ipq40xx, lantiq Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/generic/hack-4.19/550-loop-Report-EOPNOTSUPP-properly.patch')
-rw-r--r--target/linux/generic/hack-4.19/550-loop-Report-EOPNOTSUPP-properly.patch41
1 files changed, 41 insertions, 0 deletions
diff --git a/target/linux/generic/hack-4.19/550-loop-Report-EOPNOTSUPP-properly.patch b/target/linux/generic/hack-4.19/550-loop-Report-EOPNOTSUPP-properly.patch
new file mode 100644
index 0000000000..023de0078d
--- /dev/null
+++ b/target/linux/generic/hack-4.19/550-loop-Report-EOPNOTSUPP-properly.patch
@@ -0,0 +1,41 @@
+From 2e864386e62e702a343be2507062ee08d5dfc810 Mon Sep 17 00:00:00 2001
+From: Evan Green <evgreen@chromium.org>
+Date: Thu, 14 Nov 2019 15:50:07 -0800
+Subject: loop: Report EOPNOTSUPP properly
+
+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>
+---
+ drivers/block/loop.c | 7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+--- a/drivers/block/loop.c
++++ b/drivers/block/loop.c
+@@ -460,7 +460,7 @@ static void lo_complete_rq(struct reques
+ 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;
+ }
+
+@@ -1904,7 +1904,10 @@ static void loop_handle_cmd(struct loop_
+ 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);
+ }
+ }