Commit caec5ebe authored by Jens Axboe's avatar Jens Axboe

io_uring: rely solely on FMODE_NOWAIT

Now that we have both sockets and block devices setting FMODE_NOWAIT
appropriately, we can get rid of all the odd special casing in
__io_file_supports_nowait() and rely soley on FMODE_NOWAIT and
O_NONBLOCK rather than special case sockets and (in particular) bdevs.

Link: https://lore.kernel.org/r/20230509151910.183637-4-axboe@kernel.dkSigned-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent e9833d87
...@@ -1758,11 +1758,6 @@ static void io_iopoll_req_issued(struct io_kiocb *req, unsigned int issue_flags) ...@@ -1758,11 +1758,6 @@ static void io_iopoll_req_issued(struct io_kiocb *req, unsigned int issue_flags)
} }
} }
static bool io_bdev_nowait(struct block_device *bdev)
{
return !bdev || bdev_nowait(bdev);
}
/* /*
* If we tracked the file through the SCM inflight mechanism, we could support * If we tracked the file through the SCM inflight mechanism, we could support
* any file. For now, just ensure that anything potentially problematic is done * any file. For now, just ensure that anything potentially problematic is done
...@@ -1770,22 +1765,6 @@ static bool io_bdev_nowait(struct block_device *bdev) ...@@ -1770,22 +1765,6 @@ static bool io_bdev_nowait(struct block_device *bdev)
*/ */
static bool __io_file_supports_nowait(struct file *file, umode_t mode) static bool __io_file_supports_nowait(struct file *file, umode_t mode)
{ {
if (S_ISBLK(mode)) {
if (IS_ENABLED(CONFIG_BLOCK) &&
io_bdev_nowait(I_BDEV(file->f_mapping->host)))
return true;
return false;
}
if (S_ISSOCK(mode))
return true;
if (S_ISREG(mode)) {
if (IS_ENABLED(CONFIG_BLOCK) &&
io_bdev_nowait(file->f_inode->i_sb->s_bdev) &&
!io_is_uring_fops(file))
return true;
return false;
}
/* any ->read/write should understand O_NONBLOCK */ /* any ->read/write should understand O_NONBLOCK */
if (file->f_flags & O_NONBLOCK) if (file->f_flags & O_NONBLOCK)
return true; return true;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment