io_uring: cleanup io_alloc_async_ctx()

Cleanup io_alloc_async_ctx() a bit, add a new __io_alloc_async_ctx(),
so io_setup_async_rw() won't need to check whether async_ctx is true
or false again.

Reviewed-by: Stefano Garzarella <sgarzare@redhat.com>
Signed-off-by: Xiaoguang Wang <xiaoguang.wang@linux.alibaba.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Xiaoguang Wang 2020-03-27 15:36:52 +08:00 committed by Jens Axboe
parent bff6035d0c
commit 3d9932a8b2
1 changed files with 9 additions and 3 deletions

View File

@ -2469,12 +2469,18 @@ static void io_req_map_rw(struct io_kiocb *req, ssize_t io_size,
} }
} }
static inline int __io_alloc_async_ctx(struct io_kiocb *req)
{
req->io = kmalloc(sizeof(*req->io), GFP_KERNEL);
return req->io == NULL;
}
static int io_alloc_async_ctx(struct io_kiocb *req) static int io_alloc_async_ctx(struct io_kiocb *req)
{ {
if (!io_op_defs[req->opcode].async_ctx) if (!io_op_defs[req->opcode].async_ctx)
return 0; return 0;
req->io = kmalloc(sizeof(*req->io), GFP_KERNEL);
return req->io == NULL; return __io_alloc_async_ctx(req);
} }
static int io_setup_async_rw(struct io_kiocb *req, ssize_t io_size, static int io_setup_async_rw(struct io_kiocb *req, ssize_t io_size,
@ -2484,7 +2490,7 @@ static int io_setup_async_rw(struct io_kiocb *req, ssize_t io_size,
if (!io_op_defs[req->opcode].async_ctx) if (!io_op_defs[req->opcode].async_ctx)
return 0; return 0;
if (!req->io) { if (!req->io) {
if (io_alloc_async_ctx(req)) if (__io_alloc_async_ctx(req))
return -ENOMEM; return -ENOMEM;
io_req_map_rw(req, io_size, iovec, fast_iov, iter); io_req_map_rw(req, io_size, iovec, fast_iov, iter);