io_uring: finish IOU_OK -> IOU_COMPLETE transition

IOU_COMPLETE is more descriptive, in that it explicitly says that the
return value means "please post a completion for this request". This
patch completes the transition from IOU_OK to IOU_COMPLETE, replacing
existing IOU_OK users.

This is a purely mechanical change.

Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/io_uring/advise.c b/io_uring/advise.c
index cb7b881665e57ffcfb16aab9fe36ffdb58fa2c43..0073f74e3658c527af43f240d039c7462b3347b7 100644 (file)
--- a/io_uring/advise.c
+++ b/io_uring/advise.c
@@ -58,7 +58,7 @@ int io_madvise(struct io_kiocb *req, unsigned int issue_flags)
 
        ret = do_madvise(current->mm, ma->addr, ma->len, ma->advice);
        io_req_set_res(req, ret, 0);
-       return IOU_OK;
+       return IOU_COMPLETE;
 #else
        return -EOPNOTSUPP;
 #endif
@@ -104,5 +104,5 @@ int io_fadvise(struct io_kiocb *req, unsigned int issue_flags)
        if (ret < 0)
                req_set_fail(req);
        io_req_set_res(req, ret, 0);
-       return IOU_OK;
+       return IOU_COMPLETE;
 }

diff --git a/io_uring/cancel.c b/io_uring/cancel.c
index 0870060bac7ca42863b6bfde08b774546a3ed20c..6d57602304df81334f011864efce3c9c8431aadd 100644 (file)
--- a/io_uring/cancel.c
+++ b/io_uring/cancel.c
@@ -229,7 +229,7 @@ done:
        if (ret < 0)
                req_set_fail(req);
        io_req_set_res(req, ret, 0);
-       return IOU_OK;
+       return IOU_COMPLETE;
 }
 
 static int __io_sync_cancel(struct io_uring_task *tctx,

diff --git a/io_uring/epoll.c b/io_uring/epoll.c
index 6d2c48ba1923645369be389791cb4137c54cc8d9..8d4610246ba0aaa352315daa046c4933eccd39d9 100644 (file)
--- a/io_uring/epoll.c
+++ b/io_uring/epoll.c
@@ -61,7 +61,7 @@ int io_epoll_ctl(struct io_kiocb *req, unsigned int issue_flags)
        if (ret < 0)
                req_set_fail(req);
        io_req_set_res(req, ret, 0);
-       return IOU_OK;
+       return IOU_COMPLETE;
 }
 
 int io_epoll_wait_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe)
@@ -88,5 +88,5 @@ int io_epoll_wait(struct io_kiocb *req, unsigned int issue_flags)
                req_set_fail(req);
 
        io_req_set_res(req, ret, 0);
-       return IOU_OK;
+       return IOU_COMPLETE;
 }

diff --git a/io_uring/fs.c b/io_uring/fs.c
index eccea851dd5a2858936f8f0d9acc6c417614358a..37079a414eabbad1ad9c41338edeb567cccbdf1c 100644 (file)
--- a/io_uring/fs.c
+++ b/io_uring/fs.c
@@ -90,7 +90,7 @@ int io_renameat(struct io_kiocb *req, unsigned int issue_flags)
 
        req->flags &= ~REQ_F_NEED_CLEANUP;
        io_req_set_res(req, ret, 0);
-       return IOU_OK;
+       return IOU_COMPLETE;
 }
 
 void io_renameat_cleanup(struct io_kiocb *req)
@@ -141,7 +141,7 @@ int io_unlinkat(struct io_kiocb *req, unsigned int issue_flags)
 
        req->flags &= ~REQ_F_NEED_CLEANUP;
        io_req_set_res(req, ret, 0);
-       return IOU_OK;
+       return IOU_COMPLETE;
 }
 
 void io_unlinkat_cleanup(struct io_kiocb *req)
@@ -185,7 +185,7 @@ int io_mkdirat(struct io_kiocb *req, unsigned int issue_flags)
 
        req->flags &= ~REQ_F_NEED_CLEANUP;
        io_req_set_res(req, ret, 0);
-       return IOU_OK;
+       return IOU_COMPLETE;
 }
 
 void io_mkdirat_cleanup(struct io_kiocb *req)
@@ -235,7 +235,7 @@ int io_symlinkat(struct io_kiocb *req, unsigned int issue_flags)
 
        req->flags &= ~REQ_F_NEED_CLEANUP;
        io_req_set_res(req, ret, 0);
-       return IOU_OK;
+       return IOU_COMPLETE;
 }
 
 int io_linkat_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe)
@@ -281,7 +281,7 @@ int io_linkat(struct io_kiocb *req, unsigned int issue_flags)
 
        req->flags &= ~REQ_F_NEED_CLEANUP;
        io_req_set_res(req, ret, 0);
-       return IOU_OK;
+       return IOU_COMPLETE;
 }
 
 void io_link_cleanup(struct io_kiocb *req)

diff --git a/io_uring/futex.c b/io_uring/futex.c
index 0ea4820cd8ff8ca4c472c4250a78ec7734d427f6..b34695022baa4727863eba0f44f7ead0f85791e3 100644 (file)
--- a/io_uring/futex.c
+++ b/io_uring/futex.c
@@ -234,7 +234,7 @@ int io_futexv_wait(struct io_kiocb *req, unsigned int issue_flags)
                kfree(futexv);
                req->async_data = NULL;
                req->flags &= ~REQ_F_ASYNC_DATA;
-               return IOU_OK;
+               return IOU_COMPLETE;
        }
 
        /*
@@ -311,7 +311,7 @@ done:
                req_set_fail(req);
        io_req_set_res(req, ret, 0);
        kfree(ifd);
-       return IOU_OK;
+       return IOU_COMPLETE;
 }
 
 int io_futex_wake(struct io_kiocb *req, unsigned int issue_flags)
@@ -328,5 +328,5 @@ int io_futex_wake(struct io_kiocb *req, unsigned int issue_flags)
        if (ret < 0)
                req_set_fail(req);
        io_req_set_res(req, ret, 0);
-       return IOU_OK;
+       return IOU_COMPLETE;
 }

diff --git a/io_uring/io_uring.c b/io_uring/io_uring.c
index 3c4a9561941f27e64721f2f134d1168dfe56a6ed..5cdccf65c6521b07764d55b42944e4b35448093d 100644 (file)
--- a/io_uring/io_uring.c
+++ b/io_uring/io_uring.c
@@ -1751,7 +1751,7 @@ static int io_issue_sqe(struct io_kiocb *req, unsigned int issue_flags)
 
        ret = __io_issue_sqe(req, issue_flags, def);
 
-       if (ret == IOU_OK) {
+       if (ret == IOU_COMPLETE) {
                if (issue_flags & IO_URING_F_COMPLETE_DEFER)
                        io_req_complete_defer(req);
                else

diff --git a/io_uring/io_uring.h b/io_uring/io_uring.h
index 81f22196a57de69f88edc2fe3660af6d3b3f470d..0ea7a435d1de55c133d38d9a733aec0e8e8df0aa 100644 (file)
--- a/io_uring/io_uring.h
+++ b/io_uring/io_uring.h
@@ -19,7 +19,6 @@
 #endif
 
 enum {
-       IOU_OK                  = 0, /* deprecated, use IOU_COMPLETE */
        IOU_COMPLETE            = 0,
 
        IOU_ISSUE_SKIP_COMPLETE = -EIOCBQUEUED,

diff --git a/io_uring/kbuf.c b/io_uring/kbuf.c
index 823e7eb15fb2a8deb68e209ea2d744d1d78162be..8cce3ebd813f31f308842cb7b757107cc93e0461 100644 (file)
--- a/io_uring/kbuf.c
+++ b/io_uring/kbuf.c
@@ -554,7 +554,7 @@ int io_manage_buffers_legacy(struct io_kiocb *req, unsigned int issue_flags)
        if (ret < 0)
                req_set_fail(req);
        io_req_set_res(req, ret, 0);
-       return IOU_OK;
+       return IOU_COMPLETE;
 }
 
 int io_register_pbuf_ring(struct io_ring_ctx *ctx, void __user *arg)

diff --git a/io_uring/msg_ring.c b/io_uring/msg_ring.c
index 50a958e9c92129ceb8e280b7f56a17b2c49fdefc..71400d6cefc84d0be642d80e9c7f227623c9caed 100644 (file)
--- a/io_uring/msg_ring.c
+++ b/io_uring/msg_ring.c
@@ -328,7 +328,7 @@ done:
                req_set_fail(req);
        }
        io_req_set_res(req, ret, 0);
-       return IOU_OK;
+       return IOU_COMPLETE;
 }
 
 int io_uring_sync_msg_ring(struct io_uring_sqe *sqe)

diff --git a/io_uring/net.c b/io_uring/net.c
index 1fbdb2bbb3f3fb25b35fe3a66cc8129839ccc5e6..ee3f721ad758d42dae99e236f71cf92a032533d5 100644 (file)
--- a/io_uring/net.c
+++ b/io_uring/net.c
@@ -128,7 +128,7 @@ int io_shutdown(struct io_kiocb *req, unsigned int issue_flags)
 
        ret = __sys_shutdown_sock(sock, shutdown->how);
        io_req_set_res(req, ret, 0);
-       return IOU_OK;
+       return IOU_COMPLETE;
 }
 
 static bool io_net_retry(struct socket *sock, int flags)
@@ -502,7 +502,7 @@ static inline bool io_send_finish(struct io_kiocb *req, int *ret,
        /* Otherwise stop bundle and use the current result. */
 finish:
        io_req_set_res(req, *ret, cflags);
-       *ret = IOU_OK;
+       *ret = IOU_COMPLETE;
        return true;
 }
 
@@ -553,7 +553,7 @@ int io_sendmsg(struct io_kiocb *req, unsigned int issue_flags)
        else if (sr->done_io)
                ret = sr->done_io;
        io_req_set_res(req, ret, 0);
-       return IOU_OK;
+       return IOU_COMPLETE;
 }
 
 static int io_send_select_buffer(struct io_kiocb *req, unsigned int issue_flags,
@@ -1459,7 +1459,7 @@ int io_send_zc(struct io_kiocb *req, unsigned int issue_flags)
                io_req_msg_cleanup(req, 0);
        }
        io_req_set_res(req, ret, IORING_CQE_F_MORE);
-       return IOU_OK;
+       return IOU_COMPLETE;
 }
 
 int io_sendmsg_zc(struct io_kiocb *req, unsigned int issue_flags)
@@ -1530,7 +1530,7 @@ int io_sendmsg_zc(struct io_kiocb *req, unsigned int issue_flags)
                io_req_msg_cleanup(req, 0);
        }
        io_req_set_res(req, ret, IORING_CQE_F_MORE);
-       return IOU_OK;
+       return IOU_COMPLETE;
 }
 
 void io_sendrecv_fail(struct io_kiocb *req)
@@ -1694,7 +1694,7 @@ int io_socket(struct io_kiocb *req, unsigned int issue_flags)
                                            sock->file_slot);
        }
        io_req_set_res(req, ret, 0);
-       return IOU_OK;
+       return IOU_COMPLETE;
 }
 
 int io_connect_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe)
@@ -1761,7 +1761,7 @@ out:
                req_set_fail(req);
        io_req_msg_cleanup(req, issue_flags);
        io_req_set_res(req, ret, 0);
-       return IOU_OK;
+       return IOU_COMPLETE;
 }
 
 int io_bind_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe)

diff --git a/io_uring/nop.c b/io_uring/nop.c
index 28f06285fdc258bb4d62c1c45f2c2560862784c3..6ac2de761fd37b66d7e1b58fe2baa76618be38ce 100644 (file)
--- a/io_uring/nop.c
+++ b/io_uring/nop.c
@@ -68,5 +68,5 @@ done:
        if (ret < 0)
                req_set_fail(req);
        io_req_set_res(req, nop->result, 0);
-       return IOU_OK;
+       return IOU_COMPLETE;
 }

diff --git a/io_uring/openclose.c b/io_uring/openclose.c
index 4dd461163457836a5d64b5dbb3042fc78e5de8e8..83e36ad4e31be9cc32f32f7e128a62e84fa8080a 100644 (file)
--- a/io_uring/openclose.c
+++ b/io_uring/openclose.c
@@ -171,7 +171,7 @@ err:
        if (ret < 0)
                req_set_fail(req);
        io_req_set_res(req, ret, 0);
-       return IOU_OK;
+       return IOU_COMPLETE;
 }
 
 int io_openat(struct io_kiocb *req, unsigned int issue_flags)
@@ -259,7 +259,7 @@ err:
        if (ret < 0)
                req_set_fail(req);
        io_req_set_res(req, ret, 0);
-       return IOU_OK;
+       return IOU_COMPLETE;
 }
 
 int io_install_fixed_fd_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe)
@@ -302,7 +302,7 @@ int io_install_fixed_fd(struct io_kiocb *req, unsigned int issue_flags)
        if (ret < 0)
                req_set_fail(req);
        io_req_set_res(req, ret, 0);
-       return IOU_OK;
+       return IOU_COMPLETE;
 }
 
 struct io_pipe {
@@ -426,7 +426,7 @@ int io_pipe(struct io_kiocb *req, unsigned int issue_flags)
 
        io_req_set_res(req, ret, 0);
        if (!ret)
-               return IOU_OK;
+               return IOU_COMPLETE;
 
        req_set_fail(req);
        if (files[0])

diff --git a/io_uring/poll.c b/io_uring/poll.c
index 8eb744eb9f4c3c41bc5d40154f81229eb35007d2..0526062e2f8137a78a4fd8de55cf765b2ddbd03f 100644 (file)
--- a/io_uring/poll.c
+++ b/io_uring/poll.c
@@ -893,7 +893,7 @@ int io_poll_add(struct io_kiocb *req, unsigned int issue_flags)
        ret = __io_arm_poll_handler(req, poll, &ipt, poll->events, issue_flags);
        if (ret > 0) {
                io_req_set_res(req, ipt.result_mask, 0);
-               return IOU_OK;
+               return IOU_COMPLETE;
        }
        return ret ?: IOU_ISSUE_SKIP_COMPLETE;
 }
@@ -948,5 +948,5 @@ out:
        }
        /* complete update request, we're done with it */
        io_req_set_res(req, ret, 0);
-       return IOU_OK;
+       return IOU_COMPLETE;
 }

diff --git a/io_uring/rsrc.c b/io_uring/rsrc.c
index 1657d775c8bab270498de1617c359ded17f5caeb..c592ceace97d8b9625d217750dfe084672db51ed 100644 (file)
--- a/io_uring/rsrc.c
+++ b/io_uring/rsrc.c
@@ -500,7 +500,7 @@ int io_files_update(struct io_kiocb *req, unsigned int issue_flags)
        if (ret < 0)
                req_set_fail(req);
        io_req_set_res(req, ret, 0);
-       return IOU_OK;
+       return IOU_COMPLETE;
 }
 
 void io_free_rsrc_node(struct io_ring_ctx *ctx, struct io_rsrc_node *node)

diff --git a/io_uring/rw.c b/io_uring/rw.c
index 17a12a1cf3a63012501a573aa9f6d3c09c6d8b9c..8857b8445e469e85bc833fa3875aa7cffb5fd0de 100644 (file)
--- a/io_uring/rw.c
+++ b/io_uring/rw.c
@@ -660,7 +660,7 @@ static int kiocb_done(struct io_kiocb *req, ssize_t ret,
                io_req_io_end(req);
                io_req_set_res(req, final_ret, io_put_kbuf(req, ret, issue_flags));
                io_req_rw_cleanup(req, issue_flags);
-               return IOU_OK;
+               return IOU_COMPLETE;
        } else {
                io_rw_done(req, ret);
        }

diff --git a/io_uring/splice.c b/io_uring/splice.c
index 7b89bd84d486d480787cbc551c575c927bd27cda..35ce4e60b495987ab1455a21bea42076a88343a8 100644 (file)
--- a/io_uring/splice.c
+++ b/io_uring/splice.c
@@ -103,7 +103,7 @@ done:
        if (ret != sp->len)
                req_set_fail(req);
        io_req_set_res(req, ret, 0);
-       return IOU_OK;
+       return IOU_COMPLETE;
 }
 
 int io_splice_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe)
@@ -144,5 +144,5 @@ done:
        if (ret != sp->len)
                req_set_fail(req);
        io_req_set_res(req, ret, 0);
-       return IOU_OK;
+       return IOU_COMPLETE;
 }

diff --git a/io_uring/statx.c b/io_uring/statx.c
index 6bc4651700a21269149489a1d91766e66191f7ae..5111e9befbfee0773e98d81d740a0a0942c9c41d 100644 (file)
--- a/io_uring/statx.c
+++ b/io_uring/statx.c
@@ -59,7 +59,7 @@ int io_statx(struct io_kiocb *req, unsigned int issue_flags)
 
        ret = do_statx(sx->dfd, sx->filename, sx->flags, sx->mask, sx->buffer);
        io_req_set_res(req, ret, 0);
-       return IOU_OK;
+       return IOU_COMPLETE;
 }
 
 void io_statx_cleanup(struct io_kiocb *req)

diff --git a/io_uring/sync.c b/io_uring/sync.c
index 255f68c37e55ccb3138138fa0cc0a2db33ee96e6..cea2d381ffd2a49a75c135f136d3ca5f463a6dc5 100644 (file)
--- a/io_uring/sync.c
+++ b/io_uring/sync.c
@@ -47,7 +47,7 @@ int io_sync_file_range(struct io_kiocb *req, unsigned int issue_flags)
 
        ret = sync_file_range(req->file, sync->off, sync->len, sync->flags);
        io_req_set_res(req, ret, 0);
-       return IOU_OK;
+       return IOU_COMPLETE;
 }
 
 int io_fsync_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe)
@@ -79,7 +79,7 @@ int io_fsync(struct io_kiocb *req, unsigned int issue_flags)
        ret = vfs_fsync_range(req->file, sync->off, end > 0 ? end : LLONG_MAX,
                                sync->flags & IORING_FSYNC_DATASYNC);
        io_req_set_res(req, ret, 0);
-       return IOU_OK;
+       return IOU_COMPLETE;
 }
 
 int io_fallocate_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe)
@@ -108,5 +108,5 @@ int io_fallocate(struct io_kiocb *req, unsigned int issue_flags)
        if (ret >= 0)
                fsnotify_modify(req->file);
        io_req_set_res(req, ret, 0);
-       return IOU_OK;
+       return IOU_COMPLETE;
 }

diff --git a/io_uring/timeout.c b/io_uring/timeout.c
index a6ff8c026b1f224eed083edaf8c6e430b83c5cb0..7f13bfa9f2b6173d1e842f8971fdbd1db460d180 100644 (file)
--- a/io_uring/timeout.c
+++ b/io_uring/timeout.c
@@ -505,7 +505,7 @@ int io_timeout_remove(struct io_kiocb *req, unsigned int issue_flags)
        if (ret < 0)
                req_set_fail(req);
        io_req_set_res(req, ret, 0);
-       return IOU_OK;
+       return IOU_COMPLETE;
 }
 
 static int __io_timeout_prep(struct io_kiocb *req,

diff --git a/io_uring/truncate.c b/io_uring/truncate.c
index 62ee73d34d72bbee6852e77a352aab9458417d50..487baf23b44e26233d565073ef1503b25d995c36 100644 (file)
--- a/io_uring/truncate.c
+++ b/io_uring/truncate.c
@@ -44,5 +44,5 @@ int io_ftruncate(struct io_kiocb *req, unsigned int issue_flags)
        ret = do_ftruncate(req->file, ft->len, 1);
 
        io_req_set_res(req, ret, 0);
-       return IOU_OK;
+       return IOU_COMPLETE;
 }

diff --git a/io_uring/uring_cmd.c b/io_uring/uring_cmd.c
index 8a6b0ddef79644fad74220b26a8d5e259265f4d3..fe84c934734e12a79b7615f5ba59485eb1dfe610 100644 (file)
--- a/io_uring/uring_cmd.c
+++ b/io_uring/uring_cmd.c
@@ -265,7 +265,7 @@ int io_uring_cmd(struct io_kiocb *req, unsigned int issue_flags)
                req_set_fail(req);
        io_req_uring_cleanup(req, issue_flags);
        io_req_set_res(req, ret, 0);
-       return IOU_OK;
+       return IOU_COMPLETE;
 }
 
 int io_uring_cmd_import_fixed(u64 ubuf, unsigned long len, int rw,

diff --git a/io_uring/waitid.c b/io_uring/waitid.c
index 54e69984cd8a814d79f7ae762d83bade5875ee47..e07a946943973729adb35b4d6ef3086b4a643a0b 100644 (file)
--- a/io_uring/waitid.c
+++ b/io_uring/waitid.c
@@ -323,5 +323,5 @@ done:
        if (ret < 0)
                req_set_fail(req);
        io_req_set_res(req, ret, 0);
-       return IOU_OK;
+       return IOU_COMPLETE;
 }

diff --git a/io_uring/xattr.c b/io_uring/xattr.c
index de5064fcae8a241941f7e4597df70ab079704015..322b94ff9e4bb27d5595c2aa807cc53bf114d6f0 100644 (file)
--- a/io_uring/xattr.c
+++ b/io_uring/xattr.c
@@ -109,7 +109,7 @@ int io_fgetxattr(struct io_kiocb *req, unsigned int issue_flags)
 
        ret = file_getxattr(req->file, &ix->ctx);
        io_xattr_finish(req, ret);
-       return IOU_OK;
+       return IOU_COMPLETE;
 }
 
 int io_getxattr(struct io_kiocb *req, unsigned int issue_flags)
@@ -122,7 +122,7 @@ int io_getxattr(struct io_kiocb *req, unsigned int issue_flags)
        ret = filename_getxattr(AT_FDCWD, ix->filename, LOOKUP_FOLLOW, &ix->ctx);
        ix->filename = NULL;
        io_xattr_finish(req, ret);
-       return IOU_OK;
+       return IOU_COMPLETE;
 }
 
 static int __io_setxattr_prep(struct io_kiocb *req,
@@ -190,7 +190,7 @@ int io_fsetxattr(struct io_kiocb *req, unsigned int issue_flags)
 
        ret = file_setxattr(req->file, &ix->ctx);
        io_xattr_finish(req, ret);
-       return IOU_OK;
+       return IOU_COMPLETE;
 }
 
 int io_setxattr(struct io_kiocb *req, unsigned int issue_flags)
@@ -203,5 +203,5 @@ int io_setxattr(struct io_kiocb *req, unsigned int issue_flags)
        ret = filename_setxattr(AT_FDCWD, ix->filename, LOOKUP_FOLLOW, &ix->ctx);
        ix->filename = NULL;
        io_xattr_finish(req, ret);
-       return IOU_OK;
+       return IOU_COMPLETE;
 }