Commit 3d6770fb authored by Jens Axboe's avatar Jens Axboe

io_uring: drop io_file_put() 'file' argument

Since the fget/fput handling was reworked in commit 09bb8394, we
never call io_file_put() with state == NULL (and hence file != NULL)
anymore. Remove that case.
Reported-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 77f1e0a5
...@@ -682,11 +682,9 @@ static void io_iopoll_req_issued(struct io_kiocb *req) ...@@ -682,11 +682,9 @@ static void io_iopoll_req_issued(struct io_kiocb *req)
list_add_tail(&req->list, &ctx->poll_list); list_add_tail(&req->list, &ctx->poll_list);
} }
static void io_file_put(struct io_submit_state *state, struct file *file) static void io_file_put(struct io_submit_state *state)
{ {
if (!state) { if (state->file) {
fput(file);
} else if (state->file) {
int diff = state->has_refs - state->used_refs; int diff = state->has_refs - state->used_refs;
if (diff) if (diff)
...@@ -711,7 +709,7 @@ static struct file *io_file_get(struct io_submit_state *state, int fd) ...@@ -711,7 +709,7 @@ static struct file *io_file_get(struct io_submit_state *state, int fd)
state->ios_left--; state->ios_left--;
return state->file; return state->file;
} }
io_file_put(state, NULL); io_file_put(state);
} }
state->file = fget_many(fd, state->ios_left); state->file = fget_many(fd, state->ios_left);
if (!state->file) if (!state->file)
...@@ -1671,7 +1669,7 @@ static int io_submit_sqe(struct io_ring_ctx *ctx, struct sqe_submit *s, ...@@ -1671,7 +1669,7 @@ static int io_submit_sqe(struct io_ring_ctx *ctx, struct sqe_submit *s,
static void io_submit_state_end(struct io_submit_state *state) static void io_submit_state_end(struct io_submit_state *state)
{ {
blk_finish_plug(&state->plug); blk_finish_plug(&state->plug);
io_file_put(state, NULL); io_file_put(state);
if (state->free_reqs) if (state->free_reqs)
kmem_cache_free_bulk(req_cachep, state->free_reqs, kmem_cache_free_bulk(req_cachep, state->free_reqs,
&state->reqs[state->cur_req]); &state->reqs[state->cur_req]);
......
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