[PATCH openEuler-1.0-LTS 457/769] io_uring: remove @nxt from handlers

15 Apr 2021

From: Pavel Begunkov asml.silence@gmail.com
mainline inclusion
from mainline-5.7-rc1
commit 014db0073cc6a12e1f421b9231d6f3aa35735823
category: feature
bugzilla: https://bugzilla.openeuler.org/show_bug.cgi?id=27
CVE: NA
---------------------------
There will be no use for @nxt in the handlers, and it's doesn't work
anyway, so purge it
Signed-off-by: Pavel Begunkov asml.silence@gmail.com
Signed-off-by: Jens Axboe axboe@kernel.dk
Conflicts:
    fs/io_uring.c
[ignore openat2 for commit cebdb98617ae
 ("io_uring: add support for IORING_OP_OPENAT2") not merged]
Signed-off-by: yangerkun yangerkun@huawei.com
Reviewed-by: zhangyi (F) yi.zhang@huawei.com
Signed-off-by: Cheng Jian cj.chengjian@huawei.com
---
 fs/io_uring.c | 197 +++++++++++++++++++++-----------------------------
 1 file changed, 83 insertions(+), 114 deletions(-)

diff --git a/fs/io_uring.c b/fs/io_uring.c
index b56b3ff5e519..270c1d0fe5e1 100644
--- a/fs/io_uring.c
+++ b/fs/io_uring.c
@@ -1801,17 +1801,6 @@ static void io_complete_rw(struct kiocb *kiocb, long res, long res2)
    io_put_req(req);
 }
-static struct io_kiocb *__io_complete_rw(struct kiocb *kiocb, long res)
-{
-	struct io_kiocb *req = container_of(kiocb, struct io_kiocb, rw.kiocb);
-	struct io_kiocb *nxt = NULL;
-
-	io_complete_rw_common(kiocb, res);
-	io_put_req_find_next(req, &nxt);
-
-	return nxt;
-}
-
 static void io_complete_rw_iopoll(struct kiocb *kiocb, long res, long res2)
 {
    struct io_kiocb *req = container_of(kiocb, struct io_kiocb, rw.kiocb);
@@ -2006,14 +1995,14 @@ static inline void io_rw_done(struct kiocb *kiocb, ssize_t ret)
    }
 }
-static void kiocb_done(struct kiocb *kiocb, ssize_t ret, struct io_kiocb **nxt)
+static void kiocb_done(struct kiocb *kiocb, ssize_t ret)
 {
    struct io_kiocb *req = container_of(kiocb, struct io_kiocb, rw.kiocb);
if (req->flags & REQ_F_CUR_POS)
    	req->file->f_pos = kiocb->ki_pos;
    if (ret >= 0 && kiocb->ki_complete == io_complete_rw)
-		*nxt = __io_complete_rw(kiocb, ret);
+		io_complete_rw(kiocb, ret, 0);
    else
    	io_rw_done(kiocb, ret);
 }
@@ -2262,8 +2251,7 @@ static int io_read_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe,
    return 0;
 }
-static int io_read(struct io_kiocb *req, struct io_kiocb **nxt,
-		   bool force_nonblock)
+static int io_read(struct io_kiocb *req, bool force_nonblock)
 {
    struct iovec inline_vecs[UIO_FASTIOV], *iovec = inline_vecs;
    struct kiocb *kiocb = &req->rw.kiocb;
@@ -2303,7 +2291,7 @@ static int io_read(struct io_kiocb *req, struct io_kiocb **nxt,
/* Catch -EAGAIN return for forced non-blocking submission */
    	if (!force_nonblock || ret2 != -EAGAIN) {
-			kiocb_done(kiocb, ret2, nxt);
+			kiocb_done(kiocb, ret2);
    	} else {
 copy_iov:
    		ret = io_setup_async_rw(req, io_size, iovec,
@@ -2352,8 +2340,7 @@ static int io_write_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe,
    return 0;
 }
-static int io_write(struct io_kiocb *req, struct io_kiocb **nxt,
-		    bool force_nonblock)
+static int io_write(struct io_kiocb *req, bool force_nonblock)
 {
    struct iovec inline_vecs[UIO_FASTIOV], *iovec = inline_vecs;
    struct kiocb *kiocb = &req->rw.kiocb;
@@ -2417,7 +2404,7 @@ static int io_write(struct io_kiocb *req, struct io_kiocb **nxt,
    	if (ret2 == -EOPNOTSUPP && (kiocb->ki_flags & IOCB_NOWAIT))
    		ret2 = -EAGAIN;
    	if (!force_nonblock || ret2 != -EAGAIN) {
-			kiocb_done(kiocb, ret2, nxt);
+			kiocb_done(kiocb, ret2);
    	} else {
 copy_iov:
    		ret = io_setup_async_rw(req, io_size, iovec,
@@ -2474,8 +2461,7 @@ static bool io_splice_punt(struct file *file)
    return !(file->f_mode & O_NONBLOCK);
 }
-static int io_splice(struct io_kiocb *req, struct io_kiocb **nxt,
-		     bool force_nonblock)
+static int io_splice(struct io_kiocb *req, bool force_nonblock)
 {
    struct io_splice *sp = &req->splice;
    struct file *in = sp->file_in;
@@ -2502,7 +2488,7 @@ static int io_splice(struct io_kiocb *req, struct io_kiocb **nxt,
    io_cqring_add_event(req, ret);
    if (ret != sp->len)
    	req_set_fail_links(req);
-	io_put_req_find_next(req, nxt);
+	io_put_req(req);
    return 0;
 }
@@ -2575,7 +2561,7 @@ static void io_wq_assign_next(struct io_wq_work **workptr, struct io_kiocb *nxt)
    }
 }
-static void __io_fsync(struct io_kiocb *req, struct io_kiocb **nxt)
+static void __io_fsync(struct io_kiocb *req)
 {
    loff_t end = req->sync.off + req->sync.len;
    int ret;
@@ -2586,7 +2572,7 @@ static void __io_fsync(struct io_kiocb *req, struct io_kiocb **nxt)
    if (ret < 0)
    	req_set_fail_links(req);
    io_cqring_add_event(req, ret);
-	io_put_req_find_next(req, nxt);
+	io_put_req(req);
 }
static void io_fsync_finish(struct io_wq_work **workptr)
@@ -2596,25 +2582,24 @@ static void io_fsync_finish(struct io_wq_work **workptr)
if (io_req_cancelled(req))
    	return;
-	__io_fsync(req, &nxt);
+	__io_fsync(req);
    io_put_req(req); /* drop submission reference */
    if (nxt)
    	io_wq_assign_next(workptr, nxt);
 }
-static int io_fsync(struct io_kiocb *req, struct io_kiocb **nxt,
-		    bool force_nonblock)
+static int io_fsync(struct io_kiocb *req, bool force_nonblock)
 {
    /* fsync always requires a blocking context */
    if (force_nonblock) {
    	req->work.func = io_fsync_finish;
    	return -EAGAIN;
    }
-	__io_fsync(req, nxt);
+	__io_fsync(req);
    return 0;
 }
-static void __io_fallocate(struct io_kiocb *req, struct io_kiocb **nxt)
+static void __io_fallocate(struct io_kiocb *req)
 {
    int ret;
@@ -2623,7 +2608,7 @@ static void __io_fallocate(struct io_kiocb *req, struct io_kiocb **nxt)
    if (ret < 0)
    	req_set_fail_links(req);
    io_cqring_add_event(req, ret);
-	io_put_req_find_next(req, nxt);
+	io_put_req(req);
 }
static void io_fallocate_finish(struct io_wq_work **workptr)
@@ -2633,7 +2618,7 @@ static void io_fallocate_finish(struct io_wq_work **workptr)
if (io_req_cancelled(req))
    	return;
-	__io_fallocate(req, &nxt);
+	__io_fallocate(req);
    io_put_req(req); /* drop submission reference */
    if (nxt)
    	io_wq_assign_next(workptr, nxt);
@@ -2651,8 +2636,7 @@ static int io_fallocate_prep(struct io_kiocb *req,
    return 0;
 }
-static int io_fallocate(struct io_kiocb *req, struct io_kiocb **nxt,
-			bool force_nonblock)
+static int io_fallocate(struct io_kiocb *req, bool force_nonblock)
 {
    /* fallocate always requiring blocking context */
    if (force_nonblock) {
@@ -2660,7 +2644,7 @@ static int io_fallocate(struct io_kiocb *req, struct io_kiocb **nxt,
    	return -EAGAIN;
    }
-	__io_fallocate(req, nxt);
+	__io_fallocate(req);
    return 0;
 }
@@ -2693,8 +2677,7 @@ static int io_openat_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe)
    return 0;
 }
-static int io_openat(struct io_kiocb *req, struct io_kiocb **nxt,
-		     bool force_nonblock)
+static int io_openat(struct io_kiocb *req, bool force_nonblock)
 {
    struct open_flags op;
    struct file *file;
@@ -2725,7 +2708,7 @@ static int io_openat(struct io_kiocb *req, struct io_kiocb **nxt,
    if (ret < 0)
    	req_set_fail_links(req);
    io_cqring_add_event(req, ret);
-	io_put_req_find_next(req, nxt);
+	io_put_req(req);
    return 0;
 }
@@ -2754,8 +2737,7 @@ static int io_epoll_ctl_prep(struct io_kiocb *req,
 #endif
 }
-static int io_epoll_ctl(struct io_kiocb *req, struct io_kiocb **nxt,
-			bool force_nonblock)
+static int io_epoll_ctl(struct io_kiocb *req, bool force_nonblock)
 {
 #if defined(CONFIG_EPOLL)
    struct io_epoll *ie = &req->epoll;
@@ -2768,7 +2750,7 @@ static int io_epoll_ctl(struct io_kiocb *req, struct io_kiocb **nxt,
    if (ret < 0)
    	req_set_fail_links(req);
    io_cqring_add_event(req, ret);
-	io_put_req_find_next(req, nxt);
+	io_put_req(req);
    return 0;
 #else
    return -EOPNOTSUPP;
@@ -2790,8 +2772,7 @@ static int io_madvise_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe)
 #endif
 }
-static int io_madvise(struct io_kiocb *req, struct io_kiocb **nxt,
-		      bool force_nonblock)
+static int io_madvise(struct io_kiocb *req, bool force_nonblock)
 {
 #if defined(CONFIG_ADVISE_SYSCALLS) && defined(CONFIG_MMU)
    struct io_madvise *ma = &req->madvise;
@@ -2804,7 +2785,7 @@ static int io_madvise(struct io_kiocb *req, struct io_kiocb **nxt,
    if (ret < 0)
    	req_set_fail_links(req);
    io_cqring_add_event(req, ret);
-	io_put_req_find_next(req, nxt);
+	io_put_req(req);
    return 0;
 #else
    return -EOPNOTSUPP;
@@ -2822,8 +2803,7 @@ static int io_fadvise_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe)
    return 0;
 }
-static int io_fadvise(struct io_kiocb *req, struct io_kiocb **nxt,
-		      bool force_nonblock)
+static int io_fadvise(struct io_kiocb *req, bool force_nonblock)
 {
    struct io_fadvise *fa = &req->fadvise;
    int ret;
@@ -2843,7 +2823,7 @@ static int io_fadvise(struct io_kiocb *req, struct io_kiocb **nxt,
    if (ret < 0)
    	req_set_fail_links(req);
    io_cqring_add_event(req, ret);
-	io_put_req_find_next(req, nxt);
+	io_put_req(req);
    return 0;
 }
@@ -2880,8 +2860,7 @@ static int io_statx_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe)
    return 0;
 }
-static int io_statx(struct io_kiocb *req, struct io_kiocb **nxt,
-		    bool force_nonblock)
+static int io_statx(struct io_kiocb *req, bool force_nonblock)
 {
    struct io_open *ctx = &req->open;
    unsigned lookup_flags;
@@ -2918,7 +2897,7 @@ static int io_statx(struct io_kiocb *req, struct io_kiocb **nxt,
    if (ret < 0)
    	req_set_fail_links(req);
    io_cqring_add_event(req, ret);
-	io_put_req_find_next(req, nxt);
+	io_put_req(req);
    return 0;
 }
@@ -2945,7 +2924,7 @@ static int io_close_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe)
 }
/* only called when __close_fd_get_file() is done */
-static void __io_close_finish(struct io_kiocb *req, struct io_kiocb **nxt)
+static void __io_close_finish(struct io_kiocb *req)
 {
    int ret;
@@ -2954,7 +2933,7 @@ static void __io_close_finish(struct io_kiocb *req, struct io_kiocb **nxt)
    	req_set_fail_links(req);
    io_cqring_add_event(req, ret);
    fput(req->close.put_file);
-	io_put_req_find_next(req, nxt);
+	io_put_req(req);
 }
static void io_close_finish(struct io_wq_work **workptr)
@@ -2963,14 +2942,13 @@ static void io_close_finish(struct io_wq_work **workptr)
    struct io_kiocb *nxt = NULL;
/* not cancellable, don't do io_req_cancelled() */
-	__io_close_finish(req, &nxt);
+	__io_close_finish(req);
    io_put_req(req); /* drop submission reference */
    if (nxt)
    	io_wq_assign_next(workptr, nxt);
 }
-static int io_close(struct io_kiocb *req, struct io_kiocb **nxt,
-		    bool force_nonblock)
+static int io_close(struct io_kiocb *req, bool force_nonblock)
 {
    int ret;
@@ -2998,7 +2976,7 @@ static int io_close(struct io_kiocb *req, struct io_kiocb **nxt,
     * No ->flush(), safely close from here and just punt the
     * fput() to async context.
     */
-	__io_close_finish(req, nxt);
+	__io_close_finish(req);
    return 0;
 }
@@ -3020,7 +2998,7 @@ static int io_prep_sfr(struct io_kiocb *req, const struct io_uring_sqe *sqe)
    return 0;
 }
-static void __io_sync_file_range(struct io_kiocb *req, struct io_kiocb **nxt)
+static void __io_sync_file_range(struct io_kiocb *req)
 {
    int ret;
@@ -3029,7 +3007,7 @@ static void __io_sync_file_range(struct io_kiocb *req, struct io_kiocb **nxt)
    if (ret < 0)
    	req_set_fail_links(req);
    io_cqring_add_event(req, ret);
-	io_put_req_find_next(req, nxt);
+	io_put_req(req);
 }
@@ -3040,14 +3018,13 @@ static void io_sync_file_range_finish(struct io_wq_work **workptr)
if (io_req_cancelled(req))
    	return;
-	__io_sync_file_range(req, &nxt);
+	__io_sync_file_range(req);
    io_put_req(req); /* put submission ref */
    if (nxt)
    	io_wq_assign_next(workptr, nxt);
 }
-static int io_sync_file_range(struct io_kiocb *req, struct io_kiocb **nxt,
-			      bool force_nonblock)
+static int io_sync_file_range(struct io_kiocb *req, bool force_nonblock)
 {
    /* sync_file_range always requires a blocking context */
    if (force_nonblock) {
@@ -3055,7 +3032,7 @@ static int io_sync_file_range(struct io_kiocb *req, struct io_kiocb **nxt,
    	return -EAGAIN;
    }
-	__io_sync_file_range(req, nxt);
+	__io_sync_file_range(req);
    return 0;
 }
@@ -3107,8 +3084,7 @@ static int io_sendmsg_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe)
 #endif
 }
-static int io_sendmsg(struct io_kiocb *req, struct io_kiocb **nxt,
-		      bool force_nonblock)
+static int io_sendmsg(struct io_kiocb *req, bool force_nonblock)
 {
 #if defined(CONFIG_NET)
    struct io_async_msghdr *kmsg = NULL;
@@ -3162,15 +3138,14 @@ static int io_sendmsg(struct io_kiocb *req, struct io_kiocb **nxt,
    io_cqring_add_event(req, ret);
    if (ret < 0)
    	req_set_fail_links(req);
-	io_put_req_find_next(req, nxt);
+	io_put_req(req);
    return 0;
 #else
    return -EOPNOTSUPP;
 #endif
 }
-static int io_send(struct io_kiocb *req, struct io_kiocb **nxt,
-		   bool force_nonblock)
+static int io_send(struct io_kiocb *req, bool force_nonblock)
 {
 #if defined(CONFIG_NET)
    struct socket *sock;
@@ -3213,7 +3188,7 @@ static int io_send(struct io_kiocb *req, struct io_kiocb **nxt,
    io_cqring_add_event(req, ret);
    if (ret < 0)
    	req_set_fail_links(req);
-	io_put_req_find_next(req, nxt);
+	io_put_req(req);
    return 0;
 #else
    return -EOPNOTSUPP;
@@ -3254,8 +3229,7 @@ static int io_recvmsg_prep(struct io_kiocb *req,
 #endif
 }
-static int io_recvmsg(struct io_kiocb *req, struct io_kiocb **nxt,
-		      bool force_nonblock)
+static int io_recvmsg(struct io_kiocb *req, bool force_nonblock)
 {
 #if defined(CONFIG_NET)
    struct io_async_msghdr *kmsg = NULL;
@@ -3311,15 +3285,14 @@ static int io_recvmsg(struct io_kiocb *req, struct io_kiocb **nxt,
    io_cqring_add_event(req, ret);
    if (ret < 0)
    	req_set_fail_links(req);
-	io_put_req_find_next(req, nxt);
+	io_put_req(req);
    return 0;
 #else
    return -EOPNOTSUPP;
 #endif
 }
-static int io_recv(struct io_kiocb *req, struct io_kiocb **nxt,
-		   bool force_nonblock)
+static int io_recv(struct io_kiocb *req, bool force_nonblock)
 {
 #if defined(CONFIG_NET)
    struct socket *sock;
@@ -3363,7 +3336,7 @@ static int io_recv(struct io_kiocb *req, struct io_kiocb **nxt,
    io_cqring_add_event(req, ret);
    if (ret < 0)
    	req_set_fail_links(req);
-	io_put_req_find_next(req, nxt);
+	io_put_req(req);
    return 0;
 #else
    return -EOPNOTSUPP;
@@ -3392,8 +3365,7 @@ static int io_accept_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe)
 }
#if defined(CONFIG_NET)
-static int __io_accept(struct io_kiocb *req, struct io_kiocb **nxt,
-		       bool force_nonblock)
+static int __io_accept(struct io_kiocb *req, bool force_nonblock)
 {
    struct io_accept *accept = &req->accept;
    unsigned file_flags;
@@ -3410,7 +3382,7 @@ static int __io_accept(struct io_kiocb *req, struct io_kiocb **nxt,
    if (ret < 0)
    	req_set_fail_links(req);
    io_cqring_add_event(req, ret);
-	io_put_req_find_next(req, nxt);
+	io_put_req(req);
    return 0;
 }
@@ -3421,20 +3393,19 @@ static void io_accept_finish(struct io_wq_work **workptr)
if (io_req_cancelled(req))
    	return;
-	__io_accept(req, &nxt, false);
+	__io_accept(req, false);
    io_put_req(req); /* drop submission reference */
    if (nxt)
    	io_wq_assign_next(workptr, nxt);
 }
 #endif
-static int io_accept(struct io_kiocb *req, struct io_kiocb **nxt,
-		     bool force_nonblock)
+static int io_accept(struct io_kiocb *req, bool force_nonblock)
 {
 #if defined(CONFIG_NET)
    int ret;
-	ret = __io_accept(req, nxt, force_nonblock);
+	ret = __io_accept(req, force_nonblock);
    if (ret == -EAGAIN && force_nonblock) {
    	req->work.func = io_accept_finish;
    	return -EAGAIN;
@@ -3469,8 +3440,7 @@ static int io_connect_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe)
 #endif
 }
-static int io_connect(struct io_kiocb *req, struct io_kiocb **nxt,
-		      bool force_nonblock)
+static int io_connect(struct io_kiocb *req, bool force_nonblock)
 {
 #if defined(CONFIG_NET)
    struct io_async_ctx __io, *io;
@@ -3508,7 +3478,7 @@ static int io_connect(struct io_kiocb *req, struct io_kiocb **nxt,
    if (ret < 0)
    	req_set_fail_links(req);
    io_cqring_add_event(req, ret);
-	io_put_req_find_next(req, nxt);
+	io_put_req(req);
    return 0;
 #else
    return -EOPNOTSUPP;
@@ -3905,7 +3875,7 @@ static int io_poll_add_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe
    return 0;
 }
-static int io_poll_add(struct io_kiocb *req, struct io_kiocb **nxt)
+static int io_poll_add(struct io_kiocb *req)
 {
    struct io_poll_iocb *poll = &req->poll;
    struct io_ring_ctx *ctx = req->ctx;
@@ -3927,7 +3897,7 @@ static int io_poll_add(struct io_kiocb *req, struct io_kiocb **nxt)
if (mask) {
    	io_cqring_ev_posted(ctx);
-		io_put_req_find_next(req, nxt);
+		io_put_req(req);
    }
    return ipt.error;
 }
@@ -4176,7 +4146,7 @@ static int io_async_cancel_one(struct io_ring_ctx *ctx, void *sqe_addr)
static void io_async_find_and_cancel(struct io_ring_ctx *ctx,
    			     struct io_kiocb *req, __u64 sqe_addr,
-				     struct io_kiocb **nxt, int success_ret)
+				     int success_ret)
 {
    unsigned long flags;
    int ret;
@@ -4202,7 +4172,7 @@ static void io_async_find_and_cancel(struct io_ring_ctx *ctx,
if (ret < 0)
    	req_set_fail_links(req);
-	io_put_req_find_next(req, nxt);
+	io_put_req(req);
 }
static int io_async_cancel_prep(struct io_kiocb *req,
@@ -4218,11 +4188,11 @@ static int io_async_cancel_prep(struct io_kiocb *req,
    return 0;
 }
-static int io_async_cancel(struct io_kiocb *req, struct io_kiocb **nxt)
+static int io_async_cancel(struct io_kiocb *req)
 {
    struct io_ring_ctx *ctx = req->ctx;
-	io_async_find_and_cancel(ctx, req, req->cancel.addr, nxt, 0);
+	io_async_find_and_cancel(ctx, req, req->cancel.addr, 0);
    return 0;
 }
@@ -4428,7 +4398,7 @@ static void io_cleanup_req(struct io_kiocb *req)
 }
static int io_issue_sqe(struct io_kiocb *req, const struct io_uring_sqe *sqe,
-			struct io_kiocb **nxt, bool force_nonblock)
+			bool force_nonblock)
 {
    struct io_ring_ctx *ctx = req->ctx;
    int ret;
@@ -4445,7 +4415,7 @@ static int io_issue_sqe(struct io_kiocb *req, const struct io_uring_sqe *sqe,
    		if (ret < 0)
    			break;
    	}
-		ret = io_read(req, nxt, force_nonblock);
+		ret = io_read(req, force_nonblock);
    	break;
    case IORING_OP_WRITEV:
    case IORING_OP_WRITE_FIXED:
@@ -4455,7 +4425,7 @@ static int io_issue_sqe(struct io_kiocb *req, const struct io_uring_sqe *sqe,
    		if (ret < 0)
    			break;
    	}
-		ret = io_write(req, nxt, force_nonblock);
+		ret = io_write(req, force_nonblock);
    	break;
    case IORING_OP_FSYNC:
    	if (sqe) {
@@ -4463,7 +4433,7 @@ static int io_issue_sqe(struct io_kiocb *req, const struct io_uring_sqe *sqe,
    		if (ret < 0)
    			break;
    	}
-		ret = io_fsync(req, nxt, force_nonblock);
+		ret = io_fsync(req, force_nonblock);
    	break;
    case IORING_OP_POLL_ADD:
    	if (sqe) {
@@ -4471,7 +4441,7 @@ static int io_issue_sqe(struct io_kiocb *req, const struct io_uring_sqe *sqe,
    		if (ret)
    			break;
    	}
-		ret = io_poll_add(req, nxt);
+		ret = io_poll_add(req);
    	break;
    case IORING_OP_POLL_REMOVE:
    	if (sqe) {
@@ -4487,7 +4457,7 @@ static int io_issue_sqe(struct io_kiocb *req, const struct io_uring_sqe *sqe,
    		if (ret < 0)
    			break;
    	}
-		ret = io_sync_file_range(req, nxt, force_nonblock);
+		ret = io_sync_file_range(req, force_nonblock);
    	break;
    case IORING_OP_SENDMSG:
    case IORING_OP_SEND:
@@ -4497,9 +4467,9 @@ static int io_issue_sqe(struct io_kiocb *req, const struct io_uring_sqe *sqe,
    			break;
    	}
    	if (req->opcode == IORING_OP_SENDMSG)
-			ret = io_sendmsg(req, nxt, force_nonblock);
+			ret = io_sendmsg(req, force_nonblock);
    	else
-			ret = io_send(req, nxt, force_nonblock);
+			ret = io_send(req, force_nonblock);
    	break;
    case IORING_OP_RECVMSG:
    case IORING_OP_RECV:
@@ -4509,9 +4479,9 @@ static int io_issue_sqe(struct io_kiocb *req, const struct io_uring_sqe *sqe,
    			break;
    	}
    	if (req->opcode == IORING_OP_RECVMSG)
-			ret = io_recvmsg(req, nxt, force_nonblock);
+			ret = io_recvmsg(req, force_nonblock);
    	else
-			ret = io_recv(req, nxt, force_nonblock);
+			ret = io_recv(req, force_nonblock);
    	break;
    case IORING_OP_TIMEOUT:
    	if (sqe) {
@@ -4535,7 +4505,7 @@ static int io_issue_sqe(struct io_kiocb *req, const struct io_uring_sqe *sqe,
    		if (ret)
    			break;
    	}
-		ret = io_accept(req, nxt, force_nonblock);
+		ret = io_accept(req, force_nonblock);
    	break;
    case IORING_OP_CONNECT:
    	if (sqe) {
@@ -4543,7 +4513,7 @@ static int io_issue_sqe(struct io_kiocb *req, const struct io_uring_sqe *sqe,
    		if (ret)
    			break;
    	}
-		ret = io_connect(req, nxt, force_nonblock);
+		ret = io_connect(req, force_nonblock);
    	break;
    case IORING_OP_ASYNC_CANCEL:
    	if (sqe) {
@@ -4551,7 +4521,7 @@ static int io_issue_sqe(struct io_kiocb *req, const struct io_uring_sqe *sqe,
    		if (ret)
    			break;
    	}
-		ret = io_async_cancel(req, nxt);
+		ret = io_async_cancel(req);
    	break;
    case IORING_OP_FALLOCATE:
    	if (sqe) {
@@ -4559,7 +4529,7 @@ static int io_issue_sqe(struct io_kiocb *req, const struct io_uring_sqe *sqe,
    		if (ret)
    			break;
    	}
-		ret = io_fallocate(req, nxt, force_nonblock);
+		ret = io_fallocate(req, force_nonblock);
    	break;
    case IORING_OP_OPENAT:
    	if (sqe) {
@@ -4567,7 +4537,7 @@ static int io_issue_sqe(struct io_kiocb *req, const struct io_uring_sqe *sqe,
    		if (ret)
    			break;
    	}
-		ret = io_openat(req, nxt, force_nonblock);
+		ret = io_openat(req, force_nonblock);
    	break;
    case IORING_OP_CLOSE:
    	if (sqe) {
@@ -4575,7 +4545,7 @@ static int io_issue_sqe(struct io_kiocb *req, const struct io_uring_sqe *sqe,
    		if (ret)
    			break;
    	}
-		ret = io_close(req, nxt, force_nonblock);
+		ret = io_close(req, force_nonblock);
    	break;
    case IORING_OP_FILES_UPDATE:
    	if (sqe) {
@@ -4591,7 +4561,7 @@ static int io_issue_sqe(struct io_kiocb *req, const struct io_uring_sqe *sqe,
    		if (ret)
    			break;
    	}
-		ret = io_statx(req, nxt, force_nonblock);
+		ret = io_statx(req, force_nonblock);
    	break;
    case IORING_OP_FADVISE:
    	if (sqe) {
@@ -4599,7 +4569,7 @@ static int io_issue_sqe(struct io_kiocb *req, const struct io_uring_sqe *sqe,
    		if (ret)
    			break;
    	}
-		ret = io_fadvise(req, nxt, force_nonblock);
+		ret = io_fadvise(req, force_nonblock);
    	break;
    case IORING_OP_MADVISE:
    	if (sqe) {
@@ -4607,7 +4577,7 @@ static int io_issue_sqe(struct io_kiocb *req, const struct io_uring_sqe *sqe,
    		if (ret)
    			break;
    	}
-		ret = io_madvise(req, nxt, force_nonblock);
+		ret = io_madvise(req, force_nonblock);
    	break;
    case IORING_OP_EPOLL_CTL:
    	if (sqe) {
@@ -4615,7 +4585,7 @@ static int io_issue_sqe(struct io_kiocb *req, const struct io_uring_sqe *sqe,
    		if (ret)
    			break;
    	}
-		ret = io_epoll_ctl(req, nxt, force_nonblock);
+		ret = io_epoll_ctl(req, force_nonblock);
    	break;
    case IORING_OP_SPLICE:
    	if (sqe) {
@@ -4623,7 +4593,7 @@ static int io_issue_sqe(struct io_kiocb *req, const struct io_uring_sqe *sqe,
    		if (ret < 0)
    			break;
    	}
-		ret = io_splice(req, nxt, force_nonblock);
+		ret = io_splice(req, force_nonblock);
    	break;
    default:
    	ret = -EINVAL;
@@ -4667,7 +4637,7 @@ static void io_wq_submit_work(struct io_wq_work **workptr)
if (!ret) {
    	do {
-			ret = io_issue_sqe(req, NULL, &nxt, false);
+			ret = io_issue_sqe(req, NULL, false);
    		/*
    		 * We can get EAGAIN for polled IO even though we're
    		 * forcing a sync submission from here, since we can't
@@ -4813,8 +4783,7 @@ static enum hrtimer_restart io_link_timeout_fn(struct hrtimer *timer)
if (prev) {
    	req_set_fail_links(prev);
-		io_async_find_and_cancel(ctx, req, prev->user_data, NULL,
-						-ETIME);
+		io_async_find_and_cancel(ctx, req, prev->user_data, -ETIME);
    	io_put_req(prev);
    } else {
    	io_cqring_add_event(req, -ETIME);
@@ -4883,7 +4852,7 @@ static void __io_queue_sqe(struct io_kiocb *req, const struct io_uring_sqe *sqe)
    		old_creds = override_creds(req->work.creds);
    }
-	ret = io_issue_sqe(req, sqe, &nxt, true);
+	ret = io_issue_sqe(req, sqe, true);
/*
     * We async punt it if the file wasn't marked NOWAIT, or if the file
-- 
2.25.1

    

2024

2023

2022

2021

2020

2019

[PATCH openEuler-1.0-LTS 457/769] io_uring: remove @nxt from handlers