io_uring: finish IOU_OK -> IOU_COMPLETE transition
Jens Axboe
maintainerPATCH 1/1 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 <[email protected]>
---
Thought I had posted this one a few weeks ago when I did it, but I had not. Let's finish this one up, don't like letting these things linger.
io_uring/advise.c +2 -2
@@ -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 ; }
io_uring/cancel.c +1 -1
@@ -229,7 +229,7 @@ int io_async_cancel(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_sync_cancel(struct io_uring_task *tctx,
io_uring/epoll.c +2 -2
@@ -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 ; }
io_uring/fs.c +5 -5
@@ -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)
io_uring/futex.c +3 -3
@@ -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 @@ int io_futex_wait(struct io_kiocb *req, unsigned int issue_flags)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 ; }
io_uring/io_uring.c +1 -1
@@ -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
io_uring/io_uring.h +0 -1
@@ -19,7 +19,6 @@#endif enum { -IOU_OK =0 ,/* deprecated, use IOU_COMPLETE */ IOU_COMPLETE =0 ,IOU_ISSUE_SKIP_COMPLETE = -EIOCBQUEUED ,
io_uring/kbuf.c +1 -1
@@ -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)
io_uring/msg_ring.c +1 -1
@@ -328,7 +328,7 @@ int io_msg_ring(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 ; }int io_uring_sync_msg_ring (struct io_uring_sqe *sqe)
io_uring/net.c +7 -7
@@ -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 @@ int io_connect(struct io_kiocb *req, unsigned int issue_flags)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)
io_uring/nop.c +1 -1
@@ -68,5 +68,5 @@ int io_nop(struct io_kiocb *req, unsigned int issue_flags)if (ret <0 )req_set_fail (req);io_req_set_res (req, nop->result,0 ); -return IOU_OK ; +return IOU_COMPLETE ; }
io_uring/openclose.c +4 -4
@@ -171,7 +171,7 @@ int io_openat2(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_openat (struct io_kiocb *req,unsigned int issue_flags)
@@ -259,7 +259,7 @@ int io_close(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_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 ])
io_uring/poll.c +2 -2
@@ -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 @@ int io_poll_remove(struct io_kiocb *req, unsigned int issue_flags) }/* complete update request, we're done with it */ io_req_set_res (req, ret,0 ); -return IOU_OK ; +return IOU_COMPLETE ; }
io_uring/rsrc.c +1 -1
@@ -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)
io_uring/rw.c +1 -1
@@ -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); }
io_uring/splice.c +2 -2
@@ -103,7 +103,7 @@ int io_tee(struct io_kiocb *req, unsigned int issue_flags)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 @@ int io_splice(struct io_kiocb *req, unsigned int issue_flags)if (ret != sp->len)req_set_fail (req);io_req_set_res (req, ret,0 ); -return IOU_OK ; +return IOU_COMPLETE ; }
io_uring/statx.c +1 -1
@@ -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)
io_uring/sync.c +3 -3
@@ -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 ; }
io_uring/timeout.c +1 -1
@@ -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,
io_uring/truncate.c +1 -1
@@ -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 ; }
io_uring/uring_cmd.c +1 -1
@@ -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,
io_uring/waitid.c +1 -1
@@ -323,5 +323,5 @@ int io_waitid(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 ; }
io_uring/xattr.c +4 -4
@@ -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 ; }
Signature · 1 line
Jens Axboe