mirror of
https://git.proxmox.com/git/pve-kernel
synced 2025-04-28 13:27:46 +00:00
f3ec9c1f62
git will automatically change the length of the index hashes when formatting a patch depending on what references are present in the submodule. After pulling in the stable tags today, git wanted to add a character to all hashes for me. Use --full-index when generating the patches to avoid such issues in the future. No functional change intended. Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
46 lines
1.8 KiB
Diff
46 lines
1.8 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Jens Axboe <axboe@kernel.dk>
|
|
Date: Tue, 10 Sep 2024 08:30:57 -0600
|
|
Subject: [PATCH] io_uring/rw: treat -EOPNOTSUPP for IOCB_NOWAIT like -EAGAIN
|
|
|
|
Some file systems, ocfs2 in this case, will return -EOPNOTSUPP for
|
|
an IOCB_NOWAIT read/write attempt. While this can be argued to be
|
|
correct, the usual return value for something that requires blocking
|
|
issue is -EAGAIN.
|
|
|
|
A refactoring io_uring commit dropped calling kiocb_done() for
|
|
negative return values, which is otherwise where we already do that
|
|
transformation. To ensure we catch it in both spots, check it in
|
|
__io_read() itself as well.
|
|
|
|
Reported-by: Robert Sander <r.sander@heinlein-support.de>
|
|
Link: https://fosstodon.org/@gurubert@mastodon.gurubert.de/113112431889638440
|
|
Cc: stable@vger.kernel.org
|
|
Fixes: a08d195b586a ("io_uring/rw: split io_read() into a helper")
|
|
Signed-off-by: Jens Axboe <axboe@kernel.dk>
|
|
(cherry picked from commit c0a9d496e0fece67db777bd48550376cf2960c47)
|
|
Signed-off-by: Daniel Kral <d.kral@proxmox.com>
|
|
---
|
|
io_uring/rw.c | 8 ++++++++
|
|
1 file changed, 8 insertions(+)
|
|
|
|
diff --git a/io_uring/rw.c b/io_uring/rw.c
|
|
index c004d21e2f12e39d336339e0340f431eddcec597..d85e2d41a992b82622571c764325af73c12b1e75 100644
|
|
--- a/io_uring/rw.c
|
|
+++ b/io_uring/rw.c
|
|
@@ -855,6 +855,14 @@ static int __io_read(struct io_kiocb *req, unsigned int issue_flags)
|
|
|
|
ret = io_iter_do_read(rw, &io->iter);
|
|
|
|
+ /*
|
|
+ * Some file systems like to return -EOPNOTSUPP for an IOCB_NOWAIT
|
|
+ * issue, even though they should be returning -EAGAIN. To be safe,
|
|
+ * retry from blocking context for either.
|
|
+ */
|
|
+ if (ret == -EOPNOTSUPP && force_nonblock)
|
|
+ ret = -EAGAIN;
|
|
+
|
|
if (ret == -EAGAIN || (req->flags & REQ_F_REISSUE)) {
|
|
req->flags &= ~REQ_F_REISSUE;
|
|
/* If we can poll, just do that. */
|