io_uring/rw: split io_read() into a helper

Add __io_read() which does the grunt of the work, leaving the completion
side to the new io_read(). No functional changes in this patch.

Reviewed-by: Gabriel Krisman Bertazi <krisman@suse.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/io_uring/rw.c b/io_uring/rw.c
index c8c822fa79805a958d2e602864a1a2ffc2d13bee..5c58962d73dac25583b896614eba5bba413128cd 100644 (file)
--- a/io_uring/rw.c
+++ b/io_uring/rw.c
@@ -708,7 +708,7 @@ static int io_rw_init_file(struct io_kiocb *req, fmode_t mode)
        return 0;
 }
 
-int io_read(struct io_kiocb *req, unsigned int issue_flags)
+static int __io_read(struct io_kiocb *req, unsigned int issue_flags)
 {
        struct io_rw *rw = io_kiocb_to_cmd(req, struct io_rw);
        struct io_rw_state __s, *s = &__s;
@@ -853,7 +853,18 @@ done:
        /* it's faster to check here then delegate to kfree */
        if (iovec)
                kfree(iovec);
-       return kiocb_done(req, ret, issue_flags);
+       return ret;
+}
+
+int io_read(struct io_kiocb *req, unsigned int issue_flags)
+{
+       int ret;
+
+       ret = __io_read(req, issue_flags);
+       if (ret >= 0)
+               return kiocb_done(req, ret, issue_flags);
+
+       return ret;
 }
 
 int io_write(struct io_kiocb *req, unsigned int issue_flags)