niansa-misc/linux
1
0
Fork 0
mirror of synced 2025-03-06 20:59:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

io_uring/alloc_cache: get rid of _nocache() helper

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

Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Jens Axboe 2025-01-23 07:34:36 -07:00
parent fa3595523d
commit ff74954e4e
3 changed files with 9 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
io_uring/io_uring.h
View file

@ -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)
{
req->async_data = io_cache_alloc(cache, GFP_KERNEL);
if (req->async_data)
req->flags |= REQ_F_ASYNC_DATA;
return req->async_data;
}
if (cache) {
req->async_data = io_cache_alloc(cache, GFP_KERNEL);
} else {
const struct io_issue_def *def = &io_issue_defs[req->opcode];
static inline void *io_uring_alloc_async_data_nocache(struct io_kiocb *req)
{
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);
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;

2
io_uring/timeout.c
View file

@ -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;

2
io_uring/waitid.c
View file

@ -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;