From: Jens Axboe <axboe@kernel.dk>
Date: Sun, 17 May 2020 20:21:38 +0000 (-0600)
Subject: io_uring: remove dead check in io_splice()
X-Git-Tag: v5.10.7~2587^2~4
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=948a7749454b1712f1b2f2429f9493eb3e4a89b0;p=platform%2Fkernel%2Flinux-rpi.git

io_uring: remove dead check in io_splice()

We checked for 'force_nonblock' higher up, so it's definitely false
at this point. Kill the check, it's a remnant of when we tried to do
inline splice without always punting to async context.

Fixes: 2fb3e82284fc ("io_uring: punt splice async because of inode mutex")
Signed-off-by: Jens Axboe <axboe@kernel.dk>
---

diff --git a/fs/io_uring.c b/fs/io_uring.c
index f18cd98..ecfd7f0 100644
--- a/fs/io_uring.c
+++ b/fs/io_uring.c
@@ -2772,11 +2772,8 @@ static int io_splice(struct io_kiocb *req, bool force_nonblock)
 	poff_in = (sp->off_in == -1) ? NULL : &sp->off_in;
 	poff_out = (sp->off_out == -1) ? NULL : &sp->off_out;
 
-	if (sp->len) {
+	if (sp->len)
 		ret = do_splice(in, poff_in, out, poff_out, sp->len, flags);
-		if (force_nonblock && ret == -EAGAIN)
-			return -EAGAIN;
-	}
 
 	io_put_file(req, in, (sp->flags & SPLICE_F_FD_IN_FIXED));
 	req->flags &= ~REQ_F_NEED_CLEANUP;