From: Christoph Hellwig <[email protected]>
To: Jens Axboe <[email protected]>
Cc: Pavel Begunkov <[email protected]>, [email protected]
Subject: [PATCH 5/8] io_uring: return REQ_F_ flags from io_file_get_flags
Date: Tue, 20 Jun 2023 13:32:32 +0200 [thread overview]
Message-ID: <[email protected]> (raw)
In-Reply-To: <[email protected]>
Two of the three callers want them, so return the more usual format,
and shift into the FFS_ form only for the fixed file table.
Signed-off-by: Christoph Hellwig <[email protected]>
---
io_uring/filetable.h | 6 ++----
io_uring/io_uring.c | 6 +++---
io_uring/rw.c | 2 +-
3 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/io_uring/filetable.h b/io_uring/filetable.h
index 351111ff888274..697cb68adc8169 100644
--- a/io_uring/filetable.h
+++ b/io_uring/filetable.h
@@ -54,10 +54,8 @@ static inline struct file *io_file_from_index(struct io_file_table *table,
static inline void io_fixed_file_set(struct io_fixed_file *file_slot,
struct file *file)
{
- unsigned long file_ptr = (unsigned long) file;
-
- file_ptr |= io_file_get_flags(file);
- file_slot->file_ptr = file_ptr;
+ file_slot->file_ptr = (unsigned long)file |
+ (io_file_get_flags(file) >> REQ_F_SUPPORT_NOWAIT_BIT);
}
static inline void io_reset_alloc_hint(struct io_ring_ctx *ctx)
diff --git a/io_uring/io_uring.c b/io_uring/io_uring.c
index 0e0bdb6ac9a202..1f348753694bfe 100644
--- a/io_uring/io_uring.c
+++ b/io_uring/io_uring.c
@@ -425,7 +425,7 @@ static void io_prep_async_work(struct io_kiocb *req)
req->work.flags |= IO_WQ_WORK_CONCURRENT;
if (req->file && !(req->flags & REQ_F_FIXED_FILE))
- req->flags |= io_file_get_flags(req->file) << REQ_F_SUPPORT_NOWAIT_BIT;
+ req->flags |= io_file_get_flags(req->file);
if (req->file && (req->flags & REQ_F_ISREG)) {
bool should_hash = def->hash_reg_file;
@@ -1771,9 +1771,9 @@ unsigned int io_file_get_flags(struct file *file)
unsigned int res = 0;
if (S_ISREG(file_inode(file)->i_mode))
- res |= FFS_ISREG;
+ res |= REQ_F_ISREG;
if ((file->f_flags & O_NONBLOCK) || (file->f_mode & FMODE_NOWAIT))
- res |= FFS_NOWAIT;
+ res |= REQ_F_SUPPORT_NOWAIT;
return res;
}
diff --git a/io_uring/rw.c b/io_uring/rw.c
index 1cf5742f2ae9cb..1bce2208b65c4f 100644
--- a/io_uring/rw.c
+++ b/io_uring/rw.c
@@ -667,7 +667,7 @@ static int io_rw_init_file(struct io_kiocb *req, fmode_t mode)
return -EBADF;
if (!(req->flags & REQ_F_FIXED_FILE))
- req->flags |= io_file_get_flags(file) << REQ_F_SUPPORT_NOWAIT_BIT;
+ req->flags |= io_file_get_flags(file);
kiocb->ki_flags = file->f_iocb_flags;
ret = kiocb_set_rw_flags(kiocb, rw->flags);
--
2.39.2
next prev parent reply other threads:[~2023-06-20 11:32 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-20 11:32 io_uring req flags cleanups Christoph Hellwig
2023-06-20 11:32 ` [PATCH 1/8] io_uring: remove __io_file_supports_nowait Christoph Hellwig
2023-06-20 11:32 ` [PATCH 2/8] io_uring: remove the mode variable in io_file_get_flags Christoph Hellwig
2023-06-20 11:32 ` [PATCH 3/8] io_uring: remove a confusing comment above io_file_get_flags Christoph Hellwig
2023-06-20 11:32 ` [PATCH 4/8] io_uring: remove io_req_ffs_set Christoph Hellwig
2023-06-20 11:32 ` Christoph Hellwig [this message]
2023-06-20 11:32 ` [PATCH 6/8] io_uring: use io_file_from_index in __io_sync_cancel Christoph Hellwig
2023-06-20 11:32 ` [PATCH 7/8] io_uring: use io_file_from_index in io_msg_grab_file Christoph Hellwig
2023-06-20 11:32 ` [PATCH 8/8] io_uring: add helpers to decode the fixed file file_ptr Christoph Hellwig
2023-06-20 15:36 ` io_uring req flags cleanups Jens Axboe
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox