[PATCH] io_uring: rename __io_submit_sqe()

[PATCH] io_uring: rename __io_submit_sqe()

[Pavel Begunkov]

__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 <asml.silence@gmail.com>
---
 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 dd220f415c39..fa1cf7263959 100644
--- a/fs/io_uring.c
+++ b/fs/io_uring.c
@@ -2579,8 +2579,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;
@@ -2685,7 +2685,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
@@ -2896,7 +2896,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
-- 
2.24.0

Re: [PATCH] io_uring: rename __io_submit_sqe()

[Jens Axboe]

On 11/21/19 11:24 AM, Pavel Begunkov wrote:
> __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.

I'm fine with this (and the other patch), but will push them
to the back of the pile for once the merge window stuff is over.

-- 
Jens Axboe

Re: [PATCH] io_uring: rename __io_submit_sqe()

[Pavel Begunkov]

[-- Attachment #1.1: Type: text/plain, Size: 477 bytes --]

On 21/11/2019 23:08, Jens Axboe wrote:
> On 11/21/19 11:24 AM, Pavel Begunkov wrote:
>> __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.
> 
> I'm fine with this (and the other patch), but will push them
> to the back of the pile for once the merge window stuff is over.
> 
Not a problem. Then, I'll send remaining patches later.

-- 
Pavel Begunkov


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

Re: [PATCH] io_uring: rename __io_submit_sqe()

[Jens Axboe]

On 11/21/19 1:30 PM, Pavel Begunkov wrote:
> On 21/11/2019 23:08, Jens Axboe wrote:
>> On 11/21/19 11:24 AM, Pavel Begunkov wrote:
>>> __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.
>>
>> I'm fine with this (and the other patch), but will push them
>> to the back of the pile for once the merge window stuff is over.
>>
> Not a problem. Then, I'll send remaining patches later.

You can just keep piling them on, that's fine. Just keep in mind
that the merge window is opening this weekend, so it has to make
sense in that context.

-- 
Jens Axboe

Re: [PATCH] io_uring: rename __io_submit_sqe()

[Bob Liu]

On 11/22/19 2:24 AM, Pavel Begunkov wrote:
> __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 <asml.silence@gmail.com>
> ---

The new name is more straightforward.
Reviewed-by: Bob Liu <bob.liu@oralce.com>

>  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 dd220f415c39..fa1cf7263959 100644
> --- a/fs/io_uring.c
> +++ b/fs/io_uring.c
> @@ -2579,8 +2579,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;
> @@ -2685,7 +2685,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
> @@ -2896,7 +2896,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
>