diff options
| author | Christoph Hellwig <hch@lst.de> | 2023-06-20 13:32:31 +0200 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2023-06-20 09:36:22 -0600 |
| commit | 3beed235d1a1d0a4ab093ab67ea6b2841e9d4fa2 (patch) | |
| tree | 3b9af55d49cc0681b4a195c8c9a142a5ff1e1ec8 | |
| parent | b57c7cd1c17616ae9db5614525ba703f384afd05 (diff) | |
io_uring: remove io_req_ffs_set
Just checking the flag directly makes it a lot more obvious what is
going on here.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Link: https://lore.kernel.org/r/20230620113235.920399-5-hch@lst.de
Signed-off-by: Jens Axboe <axboe@kernel.dk>
| -rw-r--r-- | io_uring/io_uring.c | 2 | ||||
| -rw-r--r-- | io_uring/io_uring.h | 5 | ||||
| -rw-r--r-- | io_uring/rw.c | 2 |
3 files changed, 2 insertions, 7 deletions
diff --git a/io_uring/io_uring.c b/io_uring/io_uring.c index 79f3cabec5b9..0e0bdb6ac9a2 100644 --- a/io_uring/io_uring.c +++ b/io_uring/io_uring.c @@ -424,7 +424,7 @@ static void io_prep_async_work(struct io_kiocb *req) if (req->flags & REQ_F_FORCE_ASYNC) req->work.flags |= IO_WQ_WORK_CONCURRENT; - if (req->file && !io_req_ffs_set(req)) + if (req->file && !(req->flags & REQ_F_FIXED_FILE)) req->flags |= io_file_get_flags(req->file) << REQ_F_SUPPORT_NOWAIT_BIT; if (req->file && (req->flags & REQ_F_ISREG)) { diff --git a/io_uring/io_uring.h b/io_uring/io_uring.h index a937b4b75aee..9718897133db 100644 --- a/io_uring/io_uring.h +++ b/io_uring/io_uring.h @@ -57,11 +57,6 @@ struct file *io_file_get_normal(struct io_kiocb *req, int fd); struct file *io_file_get_fixed(struct io_kiocb *req, int fd, unsigned issue_flags); -static inline bool io_req_ffs_set(struct io_kiocb *req) -{ - return req->flags & REQ_F_FIXED_FILE; -} - void __io_req_task_work_add(struct io_kiocb *req, unsigned flags); bool io_is_uring_fops(struct file *file); bool io_alloc_async_data(struct io_kiocb *req); diff --git a/io_uring/rw.c b/io_uring/rw.c index c23d8baf0287..1cf5742f2ae9 100644 --- a/io_uring/rw.c +++ b/io_uring/rw.c @@ -666,7 +666,7 @@ static int io_rw_init_file(struct io_kiocb *req, fmode_t mode) if (unlikely(!file || !(file->f_mode & mode))) return -EBADF; - if (!io_req_ffs_set(req)) + if (!(req->flags & REQ_F_FIXED_FILE)) req->flags |= io_file_get_flags(file) << REQ_F_SUPPORT_NOWAIT_BIT; kiocb->ki_flags = file->f_iocb_flags; |