Commit 7668b92a authored by Pavel Begunkov's avatar Pavel Begunkov Committed by Jens Axboe

io_uring: remove nr_events arg from iopoll_check()

Nobody checks io_iopoll_check()'s output parameter @nr_events.
Remove the parameter and declare it further down the stack.
Signed-off-by: default avatarPavel Begunkov <asml.silence@gmail.com>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 9dedd563
...@@ -2080,9 +2080,9 @@ static void io_iopoll_reap_events(struct io_ring_ctx *ctx) ...@@ -2080,9 +2080,9 @@ static void io_iopoll_reap_events(struct io_ring_ctx *ctx)
mutex_unlock(&ctx->uring_lock); mutex_unlock(&ctx->uring_lock);
} }
static int io_iopoll_check(struct io_ring_ctx *ctx, unsigned *nr_events, static int io_iopoll_check(struct io_ring_ctx *ctx, long min)
long min)
{ {
unsigned int nr_events = 0;
int iters = 0, ret = 0; int iters = 0, ret = 0;
/* /*
...@@ -2116,11 +2116,11 @@ static int io_iopoll_check(struct io_ring_ctx *ctx, unsigned *nr_events, ...@@ -2116,11 +2116,11 @@ static int io_iopoll_check(struct io_ring_ctx *ctx, unsigned *nr_events,
mutex_lock(&ctx->uring_lock); mutex_lock(&ctx->uring_lock);
} }
ret = io_iopoll_getevents(ctx, nr_events, min); ret = io_iopoll_getevents(ctx, &nr_events, min);
if (ret <= 0) if (ret <= 0)
break; break;
ret = 0; ret = 0;
} while (min && !*nr_events && !need_resched()); } while (min && !nr_events && !need_resched());
mutex_unlock(&ctx->uring_lock); mutex_unlock(&ctx->uring_lock);
return ret; return ret;
...@@ -7977,8 +7977,6 @@ SYSCALL_DEFINE6(io_uring_enter, unsigned int, fd, u32, to_submit, ...@@ -7977,8 +7977,6 @@ SYSCALL_DEFINE6(io_uring_enter, unsigned int, fd, u32, to_submit,
goto out; goto out;
} }
if (flags & IORING_ENTER_GETEVENTS) { if (flags & IORING_ENTER_GETEVENTS) {
unsigned nr_events = 0;
min_complete = min(min_complete, ctx->cq_entries); min_complete = min(min_complete, ctx->cq_entries);
/* /*
...@@ -7989,7 +7987,7 @@ SYSCALL_DEFINE6(io_uring_enter, unsigned int, fd, u32, to_submit, ...@@ -7989,7 +7987,7 @@ SYSCALL_DEFINE6(io_uring_enter, unsigned int, fd, u32, to_submit,
*/ */
if (ctx->flags & IORING_SETUP_IOPOLL && if (ctx->flags & IORING_SETUP_IOPOLL &&
!(ctx->flags & IORING_SETUP_SQPOLL)) { !(ctx->flags & IORING_SETUP_SQPOLL)) {
ret = io_iopoll_check(ctx, &nr_events, min_complete); ret = io_iopoll_check(ctx, min_complete);
} else { } else {
ret = io_cqring_wait(ctx, min_complete, sig, sigsz); ret = io_cqring_wait(ctx, min_complete, sig, sigsz);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment