redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

io_uring: drop io_file_put() 'file' argument 

Since the fget/fput handling was reworked in commit 09bb839434, we
never call io_file_put() with state == NULL (and hence file != NULL)
anymore. Remove that case.

Reported-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
hifive-unleashed-5.1
Jens Axboe 2019-04-13 11:50:54 -06:00
parent 77f1e0a52d
commit 3d6770fbd9
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
fs/io_uring.c
View File

@ -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)
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 @@ out:
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]);