Commit 9f13c35b authored by Pavel Begunkov's avatar Pavel Begunkov Committed by Jens Axboe
Browse files

io_uring: rename io_file_put() 



io_file_put() deals with flushing state's file refs, adding "state" to
its name makes it a bit clearer. Also, avoid double check of
state->file in __io_file_get() in some cases.

Signed-off-by: default avatarPavel Begunkov <asml.silence@gmail.com>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 0cdaf760

fs/io_uring.c

+13 −9
Original line number Diff line number Diff line
@@ -1999,15 +1999,19 @@ static void io_iopoll_req_issued(struct io_kiocb *req) 
		wake_up(&ctx->sqo_wait);

}



static void io_file_put(struct io_submit_state *state)

static void __io_state_file_put(struct io_submit_state *state)

{

	if (state->file) {

	int diff = state->has_refs - state->used_refs;



	if (diff)

		fput_many(state->file, diff);

	state->file = NULL;

}



static inline void io_state_file_put(struct io_submit_state *state)

{

	if (state->file)

		__io_state_file_put(state);

}



/*
@@ -2026,7 +2030,7 @@ static struct file *__io_file_get(struct io_submit_state *state, int fd) 
			state->ios_left--;

			return state->file;

		}

		io_file_put(state);

		__io_state_file_put(state);

	}

	state->file = fget_many(fd, state->ios_left);

	if (!state->file)
@@ -5790,7 +5794,7 @@ static int io_submit_sqe(struct io_kiocb *req, const struct io_uring_sqe *sqe, 
static void io_submit_state_end(struct io_submit_state *state)

{

	blk_finish_plug(&state->plug);

	io_file_put(state);

	io_state_file_put(state);

	if (state->free_reqs)

		kmem_cache_free_bulk(req_cachep, state->free_reqs, state->reqs);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE