io_uring: cleanup io_alloc_async_ctx()
PATCH 1/1 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.
Signed-off-by Xiaoguang Wang <[email protected]>
--- fs/io_uring.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)
fs/io_uring.c +9 -3
@@ -2169,12 +2169,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) {if (!io_op_defs[req->opcode].async_ctx)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,
@@ -2184,7 +2190,7 @@ static int io_setup_async_rw(struct io_kiocb *req, ssize_t io_size,if (!io_op_defs[req->opcode].async_ctx)return 0 ;if (!req->io) { -if (io_alloc_async_ctx (req)) +if (__io_alloc_async_ctx (req))return -ENOMEM ;io_req_map_rw (req, io_size, iovec, fast_iov, iter);
Signature · 1 line
2.17.2
Quoted 8 lines · Xiaoguang Wang
Cleanup
io_alloc_async_ctx()a bit, add a new__io_alloc_async_ctx(), soio_setup_async_rw()won't need to check whetherasync_ctxis true or false again.Signed-off-by Xiaoguang Wang <[email protected]>--- fs/io_uring.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)
Looks good to me!
Reviewed-by Stefano Garzarella <[email protected]>
Thanks,
Stefano
Quoted 38 lines
fs/io_uring.c +9
-3@@ -2169,12 +2169,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) {if (!io_op_defs[req->opcode].async_ctx)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,@@ -2184,7 +2190,7 @@ static int io_setup_async_rw(struct io_kiocb *req, ssize_t io_size,if (!io_op_defs[req->opcode].async_ctx)return 0 ;if (!req->io) { -if (io_alloc_async_ctx (req)) +if (__io_alloc_async_ctx (req))return -ENOMEM ;io_req_map_rw (req, io_size, iovec, fast_iov, iter);Signature · 1 line
2.17.2
Quoted 3 lines · Xiaoguang Wang
Cleanup
io_alloc_async_ctx()a bit, add a new__io_alloc_async_ctx(), soio_setup_async_rw()won't need to check whetherasync_ctxis true or false again.
Applied, thanks.
Signature · 1 line
Jens Axboe