On Thu 17-08-23 17:13:31, Amir Goldstein wrote:
> This helper does not take a kiocb as input and we want to create a
> common helper by that name that takes a kiocb as input.
>
> Signed-off-by: Amir Goldstein <amir73il@xxxxxxxxx>
Looks good. Feel free to add:
Reviewed-by: Jan Kara <jack@xxxxxxx>
Honza
> ---
> io_uring/rw.c | 10 +++++-----
> 1 file changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/io_uring/rw.c b/io_uring/rw.c
> index 1bce2208b65c..749ebd565839 100644
> --- a/io_uring/rw.c
> +++ b/io_uring/rw.c
> @@ -220,7 +220,7 @@ static bool io_rw_should_reissue(struct io_kiocb *req)
> }
> #endif
>
> -static void kiocb_end_write(struct io_kiocb *req)
> +static void io_req_end_write(struct io_kiocb *req)
> {
> /*
> * Tell lockdep we inherited freeze protection from submission
> @@ -243,7 +243,7 @@ static void io_req_io_end(struct io_kiocb *req)
> struct io_rw *rw = io_kiocb_to_cmd(req, struct io_rw);
>
> if (rw->kiocb.ki_flags & IOCB_WRITE) {
> - kiocb_end_write(req);
> + io_req_end_write(req);
> fsnotify_modify(req->file);
> } else {
> fsnotify_access(req->file);
> @@ -313,7 +313,7 @@ static void io_complete_rw_iopoll(struct kiocb *kiocb, long res)
> struct io_kiocb *req = cmd_to_io_kiocb(rw);
>
> if (kiocb->ki_flags & IOCB_WRITE)
> - kiocb_end_write(req);
> + io_req_end_write(req);
> if (unlikely(res != req->cqe.res)) {
> if (res == -EAGAIN && io_rw_should_reissue(req)) {
> req->flags |= REQ_F_REISSUE | REQ_F_PARTIAL_IO;
> @@ -961,7 +961,7 @@ int io_write(struct io_kiocb *req, unsigned int issue_flags)
> io->bytes_done += ret2;
>
> if (kiocb->ki_flags & IOCB_WRITE)
> - kiocb_end_write(req);
> + io_req_end_write(req);
> return ret ? ret : -EAGAIN;
> }
> done:
> @@ -972,7 +972,7 @@ int io_write(struct io_kiocb *req, unsigned int issue_flags)
> ret = io_setup_async_rw(req, iovec, s, false);
> if (!ret) {
> if (kiocb->ki_flags & IOCB_WRITE)
> - kiocb_end_write(req);
> + io_req_end_write(req);
> return -EAGAIN;
> }
> return ret;
> --
> 2.34.1
>
--
Jan Kara <jack@xxxxxxxx>
SUSE Labs, CR
