diff options
| author | Jens Axboe <axboe@kernel.dk> | 2021-04-01 17:38:34 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-04-16 12:43:21 +0300 |
| commit | 6fbdce3cde97896ff4c2fb99e5d4bba45297a178 (patch) | |
| tree | 847d3f8d0ac1cee0fac8403ede9ac62511a96859 /fs/io_uring.c | |
| parent | 5d4600017beeab73e0d5550f9485564fba66b460 (diff) | |
| download | linux-6fbdce3cde97896ff4c2fb99e5d4bba45297a178.tar.xz | |
io_uring: don't mark S_ISBLK async work as unbounded
[ Upstream commit 4b982bd0f383db9132e892c0c5144117359a6289 ]
S_ISBLK is marked as unbounded work for async preparation, because it
doesn't match S_ISREG. That is incorrect, as any read/write to a block
device is also a bounded operation. Fix it up and ensure that S_ISBLK
isn't marked unbounded.
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'fs/io_uring.c')
| -rw-r--r-- | fs/io_uring.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/io_uring.c b/fs/io_uring.c index 0de27e75460d..dc1b0f6fd49b 100644 --- a/fs/io_uring.c +++ b/fs/io_uring.c @@ -1439,7 +1439,7 @@ static void io_prep_async_work(struct io_kiocb *req) if (req->flags & REQ_F_ISREG) { if (def->hash_reg_file || (ctx->flags & IORING_SETUP_IOPOLL)) io_wq_hash_work(&req->work, file_inode(req->file)); - } else { + } else if (!req->file || !S_ISBLK(file_inode(req->file)->i_mode)) { if (def->unbound_nonreg_file) req->work.flags |= IO_WQ_WORK_UNBOUND; } |