Commit ff74954e authored by Jens Axboe's avatar Jens Axboe
Browse files

io_uring/alloc_cache: get rid of _nocache() helper 



Just allow passing in NULL for the cache, if the type in question
doesn't have a cache associated with it.

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

io_uring/io_uring.h

+7 −11
Original line number Diff line number Diff line
@@ -228,18 +228,14 @@ static inline void io_req_set_res(struct io_kiocb *req, s32 res, u32 cflags) 
static inline void *io_uring_alloc_async_data(struct io_alloc_cache *cache,

					      struct io_kiocb *req)

{

	if (cache) {

		req->async_data = io_cache_alloc(cache, GFP_KERNEL);

	if (req->async_data)

		req->flags |= REQ_F_ASYNC_DATA;

	return req->async_data;

}



static inline void *io_uring_alloc_async_data_nocache(struct io_kiocb *req)

{

	} else {

		const struct io_issue_def *def = &io_issue_defs[req->opcode];



		WARN_ON_ONCE(!def->async_size);

		req->async_data = kmalloc(def->async_size, GFP_KERNEL);

	}

	if (req->async_data)

		req->flags |= REQ_F_ASYNC_DATA;

	return req->async_data;

io_uring/timeout.c

+1 −1
Original line number Diff line number Diff line
@@ -544,7 +544,7 @@ static int __io_timeout_prep(struct io_kiocb *req, 


	if (WARN_ON_ONCE(req_has_async_data(req)))

		return -EFAULT;

	data = io_uring_alloc_async_data_nocache(req);

	data = io_uring_alloc_async_data(NULL, req);

	if (!data)

		return -ENOMEM;

	data->req = req;

io_uring/waitid.c

+1 −1
Original line number Diff line number Diff line
@@ -303,7 +303,7 @@ int io_waitid(struct io_kiocb *req, unsigned int issue_flags) 
	struct io_waitid_async *iwa;

	int ret;



	iwa = io_uring_alloc_async_data_nocache(req);

	iwa = io_uring_alloc_async_data(NULL, req);

	if (!iwa)

		return -ENOMEM;