Commit 3648e526 authored by Hao Xu's avatar Hao Xu Committed by Jens Axboe
Browse files

io_uring: move up io_put_kbuf() and io_put_rw_kbuf() 



Move them up to avoid explicit declaration. We will use them in later
patches.

Reviewed-by: default avatarPavel Begunkov <asml.silence@gmail.com>
Signed-off-by: default avatarHao Xu <haoxu@linux.alibaba.com>
Signed-off-by: default avatarPavel Begunkov <asml.silence@gmail.com>
Link: https://lore.kernel.org/r/3631243d6fc4a79bbba0cd62597fc8cd5be95924.1638714983.git.asml.silence@gmail.com


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 2087009c

fs/io_uring.c

+18 −18
Original line number Diff line number Diff line
@@ -1273,6 +1273,24 @@ static inline void io_req_set_rsrc_node(struct io_kiocb *req, 
	}

}



static unsigned int io_put_kbuf(struct io_kiocb *req, struct io_buffer *kbuf)

{

	unsigned int cflags;



	cflags = kbuf->bid << IORING_CQE_BUFFER_SHIFT;

	cflags |= IORING_CQE_F_BUFFER;

	req->flags &= ~REQ_F_BUFFER_SELECTED;

	kfree(kbuf);

	return cflags;

}



static inline unsigned int io_put_rw_kbuf(struct io_kiocb *req)

{

	if (likely(!(req->flags & REQ_F_BUFFER_SELECTED)))

		return 0;

	return io_put_kbuf(req, req->kbuf);

}



static void io_refs_resurrect(struct percpu_ref *ref, struct completion *compl)

{

	bool got = percpu_ref_tryget(ref);
@@ -2456,24 +2474,6 @@ static inline unsigned int io_sqring_entries(struct io_ring_ctx *ctx) 
	return smp_load_acquire(&rings->sq.tail) - ctx->cached_sq_head;

}



static unsigned int io_put_kbuf(struct io_kiocb *req, struct io_buffer *kbuf)

{

	unsigned int cflags;



	cflags = kbuf->bid << IORING_CQE_BUFFER_SHIFT;

	cflags |= IORING_CQE_F_BUFFER;

	req->flags &= ~REQ_F_BUFFER_SELECTED;

	kfree(kbuf);

	return cflags;

}



static inline unsigned int io_put_rw_kbuf(struct io_kiocb *req)

{

	if (likely(!(req->flags & REQ_F_BUFFER_SELECTED)))

		return 0;

	return io_put_kbuf(req, req->kbuf);

}



static inline bool io_run_task_work(void)

{

	if (test_thread_flag(TIF_NOTIFY_SIGNAL) || current->task_works) {