diff options
| author | Jens Axboe <axboe@kernel.dk> | 2019-04-13 19:50:54 +0200 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2019-04-14 03:08:22 +0200 |
| commit | 3d6770fbd9353988839611bab107e4e891506aad (patch) | |
| tree | 5269b98bee6e45d1230a59454b97fec30cb64b6a | |
| parent | bfq: update internal depth state when queue depth changes (diff) | |
| download | linux-3d6770fbd9353988839611bab107e4e891506aad.tar.xz linux-3d6770fbd9353988839611bab107e4e891506aad.zip | |
io_uring: drop io_file_put() 'file' argument
Since the fget/fput handling was reworked in commit 09bb839434bd, 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>
| -rw-r--r-- | fs/io_uring.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/fs/io_uring.c b/fs/io_uring.c index 24355e0c47f0..f4ddb9d23241 100644 --- a/fs/io_uring.c +++ b/fs/io_uring.c @@ -682,11 +682,9 @@ static void io_iopoll_req_issued(struct io_kiocb *req) 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) { - fput(file); - } else if (state->file) { + if (state->file) { int diff = state->has_refs - state->used_refs; if (diff) @@ -711,7 +709,7 @@ static struct file *io_file_get(struct io_submit_state *state, int fd) state->ios_left--; return state->file; } - io_file_put(state, NULL); + io_file_put(state); } state->file = fget_many(fd, state->ios_left); if (!state->file) @@ -1671,7 +1669,7 @@ out: static void io_submit_state_end(struct io_submit_state *state) { blk_finish_plug(&state->plug); - io_file_put(state, NULL); + io_file_put(state); if (state->free_reqs) kmem_cache_free_bulk(req_cachep, state->free_reqs, &state->reqs[state->cur_req]); |