io_uring: simplify io_uring_cmd return

isilence · axboe · commit f1dcdfcadb0c · 2024-07-24T08:01:49.000-06:00
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 e0b23d9 ("io_uring: optimise ltimeout for inline execution"), there was a problem with iopoll before. Signed-off-by: Pavel Begunkov <asml.silence@gmail.com> Link: https://lore.kernel.org/r/8eae2be5b2a49236cd5f1dadbd1aa5730e9e2d4f.1721819383.git.asml.silence@gmail.com Signed-off-by: Jens Axboe <axboe@kernel.dk>
diff --git 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,

Original file line number	Diff line number	Diff line change
`@@ -265,7 +265,7 @@ int io_uring_cmd(struct io_kiocb *req, unsigned int issue_flags)`
`265`	`265`	`req_set_fail(req);`
`266`	`266`	`io_req_uring_cleanup(req, issue_flags);`
`267`	`267`	`io_req_set_res(req, ret, 0);`
`268`		`- return ret < 0 ? ret : IOU_OK;`
	`268`	`+ return IOU_OK;`
`269`	`269`	`}`
`270`	`270`
`271`	`271`	`int io_uring_cmd_import_fixed(u64 ubuf, unsigned long len, int rw,`