From: Pavel Begunkov Date: Wed, 24 Jul 2024 11:16:19 +0000 (+0100) Subject: io_uring: simplify io_uring_cmd return X-Git-Tag: v6.11-rc1~10^2~5 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f1dcdfcadb0c8c13dddd931c1f4dc58e54fdc9c0;p=thirdparty%2Fkernel%2Flinux.git io_uring: simplify io_uring_cmd return We don't have to return error code from an op handler back to core io_uring, so once io_uring_cmd() sets the results and handles errors we can juts return IOU_OK and simplify the code. Note, only valid with e0b23d9953b0c ("io_uring: optimise ltimeout for inline execution"), there was a problem with iopoll before. Signed-off-by: Pavel Begunkov Link: https://lore.kernel.org/r/8eae2be5b2a49236cd5f1dadbd1aa5730e9e2d4f.1721819383.git.asml.silence@gmail.com Signed-off-by: Jens Axboe --- diff --git a/io_uring/uring_cmd.c b/io_uring/uring_cmd.c index a54163a839686..8391c7c7c1ec4 100644 --- a/io_uring/uring_cmd.c +++ b/io_uring/uring_cmd.c @@ -265,7 +265,7 @@ int io_uring_cmd(struct io_kiocb *req, unsigned int issue_flags) req_set_fail(req); io_req_uring_cleanup(req, issue_flags); io_req_set_res(req, ret, 0); - return ret < 0 ? ret : IOU_OK; + return IOU_OK; } int io_uring_cmd_import_fixed(u64 ubuf, unsigned long len, int rw,