Commit 8487f083 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe
Browse files

io_uring: return REQ_F_ flags from io_file_get_flags 



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: default avatarChristoph Hellwig <hch@lst.de>
Link: https://lore.kernel.org/r/20230620113235.920399-6-hch@lst.de


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 3beed235

io_uring/filetable.h

+2 −4
Original line number Diff line number Diff line
@@ -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)

io_uring/io_uring.c

+3 −3
Original line number Diff line number Diff line
@@ -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;

}

io_uring/rw.c

+1 −1
Original line number Diff line number Diff line
@@ -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);