io_uring: remove dead check in io_splice() (948a7749) · Commits · 戴 / test

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: ("io_uring: punt splice async because of inode mutex") Signed-off-by:

Jens Axboe <axboe@kernel.dk>

fs/io_uring.c

+1 −4

Original line number	Diff line number	Diff line
		@@ -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;

Admin message