diff options
| author |   Pavel Begunkov <asml.silence@gmail.com> | 2021-06-24 15:10:00 +0100 |
|---|---|---|
| committer |   Jens Axboe <axboe@kernel.dk> | 2021-06-30 14:15:39 -0600 |
| commit | 12dcb58ac785ee678f577e1502d966b538375aae (patch) | |
| tree | 3b54d3a77b3ce8817bfb996038a2f73cda9efa0d /fs | |
| parent | io_uring: simplify struct io_uring_sqe layout (diff) | |
| download | linux-dev-12dcb58ac785ee678f577e1502d966b538375aae.tar.xz linux-dev-12dcb58ac785ee678f577e1502d966b538375aae.zip | |
io_uring: refactor io_openat2()
Put do_filp_open() fail path of io_openat2() under a single if,
deduplicating put_unused_fd(), making it look better and helping
the hot path.
Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
Link: https://lore.kernel.org/r/f4c84d25c049d0af2adc19c703bbfef607200209.1624543113.git.asml.silence@gmail.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/io_uring.c | 29 |
1 files changed, 14 insertions, 15 deletions
diff --git a/fs/io_uring.c b/fs/io_uring.c index fe543d639ab0..d7a68a2f2ec6 100644 --- a/fs/io_uring.c +++ b/fs/io_uring.c @@ -3851,27 +3851,26 @@ static int io_openat2(struct io_kiocb *req, unsigned int issue_flags) goto err; file = do_filp_open(req->open.dfd, req->open.filename, &op); - /* only retry if RESOLVE_CACHED wasn't already set by application */ - if ((!resolve_nonblock && (issue_flags & IO_URING_F_NONBLOCK)) && - file == ERR_PTR(-EAGAIN)) { + if (IS_ERR(file)) { /* - * We could hang on to this 'fd', but seems like marginal - * gain for something that is now known to be a slower path. - * So just put it, and we'll get a new one when we retry. + * We could hang on to this 'fd' on retrying, but seems like + * marginal gain for something that is now known to be a slower + * path. So just put it, and we'll get a new one when we retry. */ put_unused_fd(ret); - return -EAGAIN; - } - if (IS_ERR(file)) { - put_unused_fd(ret); ret = PTR_ERR(file); - } else { - if ((issue_flags & IO_URING_F_NONBLOCK) && !nonblock_set) - file->f_flags &= ~O_NONBLOCK; - fsnotify_open(file); - fd_install(ret, file); + /* only retry if RESOLVE_CACHED wasn't already set by application */ + if (ret == -EAGAIN && + (!resolve_nonblock && (issue_flags & IO_URING_F_NONBLOCK))) + return -EAGAIN; + goto err; } + + if ((issue_flags & IO_URING_F_NONBLOCK) && !nonblock_set) + file->f_flags &= ~O_NONBLOCK; + fsnotify_open(file); + fd_install(ret, file); err: putname(req->open.filename); req->flags &= ~REQ_F_NEED_CLEANUP; |