Skip to content

Commit 948a774

Browse files
committed
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: 2fb3e82 ("io_uring: punt splice async because of inode mutex") Signed-off-by: Jens Axboe <[email protected]>
1 parent bd2ab18 commit 948a774

File tree

1 file changed

+1
-4
lines changed

1 file changed

+1
-4
lines changed

fs/io_uring.c

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2772,11 +2772,8 @@ static int io_splice(struct io_kiocb *req, bool force_nonblock)
27722772
poff_in = (sp->off_in == -1) ? NULL : &sp->off_in;
27732773
poff_out = (sp->off_out == -1) ? NULL : &sp->off_out;
27742774

2775-
if (sp->len) {
2775+
if (sp->len)
27762776
ret = do_splice(in, poff_in, out, poff_out, sp->len, flags);
2777-
if (force_nonblock && ret == -EAGAIN)
2778-
return -EAGAIN;
2779-
}
27802777

27812778
io_put_file(req, in, (sp->flags & SPLICE_F_FD_IN_FIXED));
27822779
req->flags &= ~REQ_F_NEED_CLEANUP;

0 commit comments

Comments
 (0)