From 9811e2aecd78e9c1bbec712c2f30d0be2bae98bb Mon Sep 17 00:00:00 2001 From: Pavel Begunkov Date: Thu, 21 Nov 2019 21:24:36 +0300 Subject: [PATCH 1042/2944] io_uring: rename __io_submit_sqe() to #26323578 commit d732447fed7d6b4c22907f630cd25d574bae5276 upstream. __io_submit_sqe() is issuing requests, so call it as such. Moreover, it ends by calling io_iopoll_req_issued(). Rename it and make terminology clearer. Signed-off-by: Pavel Begunkov Signed-off-by: Jens Axboe Signed-off-by: Joseph Qi Acked-by: Xiaoguang Wang --- fs/io_uring.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/fs/io_uring.c b/fs/io_uring.c index 6856cb1..965ffa2 100644 --- a/fs/io_uring.c +++ b/fs/io_uring.c @@ -2596,8 +2596,8 @@ static int io_req_defer(struct io_kiocb *req) return -EIOCBQUEUED; } -static int __io_submit_sqe(struct io_kiocb *req, struct io_kiocb **nxt, - bool force_nonblock) +static int io_issue_sqe(struct io_kiocb *req, struct io_kiocb **nxt, + bool force_nonblock) { int ret, opcode; struct sqe_submit *s = &req->submit; @@ -2704,7 +2704,7 @@ static void io_wq_submit_work(struct io_wq_work **workptr) s->has_user = (work->flags & IO_WQ_WORK_HAS_MM) != 0; s->in_async = true; do { - ret = __io_submit_sqe(req, &nxt, false); + ret = io_issue_sqe(req, &nxt, false); /* * We can get EAGAIN for polled IO even though we're * forcing a sync submission from here, since we can't @@ -2915,7 +2915,7 @@ static void __io_queue_sqe(struct io_kiocb *req) struct io_kiocb *nxt = io_prep_linked_timeout(req); int ret; - ret = __io_submit_sqe(req, NULL, true); + ret = io_issue_sqe(req, NULL, true); /* * We async punt it if the file wasn't marked NOWAIT, or if the file -- 1.8.3.1