io_uring: make io_sqpoll_wait_sq return void
PATCH 1/1 io_uring: make io_sqpoll_wait_sq return void
Change the return type to void since it always return 0, and no need to do the checking in syscall io_uring_enter.
Signed-off-by Quanfa Fu <[email protected]>
--- io_uring/io_uring.c | 8 +++----- io_uring/sqpoll.c | 3 +-- io_uring/sqpoll.h | 2 +- 3 files changed, 5 insertions(+), 8 deletions(-)
io_uring/io_uring.c +3 -5
@@ -3330,11 +3330,9 @@ SYSCALL_DEFINE6(io_uring_enter, unsigned int, fd, u32, to_submit, }if (flags &IORING_ENTER_SQ_WAKEUP )wake_up (&ctx->sq_data->wait); -if (flags &IORING_ENTER_SQ_WAIT ) { - ret =io_sqpoll_wait_sq (ctx); -if (ret) - goto out; - } +if (flags &IORING_ENTER_SQ_WAIT ) +io_sqpoll_wait_sq (ctx); + ret = to_submit; }else if (to_submit) { ret =io_uring_add_tctx_node (ctx);
io_uring/sqpoll.c +1 -2
@@ -312,7 +312,7 @@ static int io_sq_thread(void *data)do_exit (0 ); } -int io_sqpoll_wait_sq (struct io_ring_ctx *ctx) +void io_sqpoll_wait_sq (struct io_ring_ctx *ctx) {DEFINE_WAIT (wait);
@@ -327,7 +327,6 @@ int io_sqpoll_wait_sq(struct io_ring_ctx *ctx) }while (!signal_pending (current));finish_wait (&ctx->sqo_sq_wait, &wait); -return 0 ; } __cold int io_sq_offload_create(struct io_ring_ctx *ctx,
io_uring/sqpoll.h +1 -1
@@ -26,4 +26,4 @@ void io_sq_thread_stop(struct io_sq_data *sqd);void io_sq_thread_park (struct io_sq_data *sqd);void io_sq_thread_unpark (struct io_sq_data *sqd);void io_put_sq_data (struct io_sq_data *sqd); -int io_sqpoll_wait_sq (struct io_ring_ctx *ctx); +void io_sqpoll_wait_sq (struct io_ring_ctx *ctx);
Signature · 1 line
2.31.1
Quoted 4 lines · Quanfa Fu
Change the return type to void since it always return 0, and no need to do the checking in syscall
io_uring_enter.
Applied, thanks!
[1/1] io_uring: make io_sqpoll_wait_sq return void
commit: 19d49cb3be0d03cd19f02fd5a0760a53bcc2ae25
Best regards,
Signature · 1 line
Jens Axboe