Commit 3beed235 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe
Browse files

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


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

io_uring/io_uring.c

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

io_uring/io_uring.h

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

io_uring/rw.c

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