diff options
| author | Pavel Begunkov <asml.silence@gmail.com> | 2022-04-18 20:51:12 +0100 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2022-04-24 18:02:52 -0600 |
| commit | 772f5e002b9ef65c22956990be9ecb2df58cd9c9 (patch) | |
| tree | cf0eccb7df253dc512ffd3c5a019653151038bc3 /fs/io_uring.c | |
| parent | 93f052cb39e1f8c7a002e2ecbc7f45f354dcf0c7 (diff) | |
| download | lwn-772f5e002b9ef65c22956990be9ecb2df58cd9c9.tar.gz lwn-772f5e002b9ef65c22956990be9ecb2df58cd9c9.zip | |
io_uring: refactor io_assign_file error path
All io_assign_file() callers do error handling themselves,
req_set_fail() in the io_assign_file()'s fail path needlessly bloats the
kernel and is not the best abstraction to have. Simplify the error path.
Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
Link: https://lore.kernel.org/r/eff77fb1eac2b6a90cca5223813e6a396ffedec0.1650311386.git.asml.silence@gmail.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'fs/io_uring.c')
| -rw-r--r-- | fs/io_uring.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/fs/io_uring.c b/fs/io_uring.c index 1b8597b82f6a..75be769ce652 100644 --- a/fs/io_uring.c +++ b/fs/io_uring.c @@ -7134,12 +7134,8 @@ static bool io_assign_file(struct io_kiocb *req, unsigned int issue_flags) req->file = io_file_get_fixed(req, req->cqe.fd, issue_flags); else req->file = io_file_get_normal(req, req->cqe.fd); - if (req->file) - return true; - req_set_fail(req); - req->cqe.res = -EBADF; - return false; + return !!req->file; } static int io_issue_sqe(struct io_kiocb *req, unsigned int issue_flags) |