Commit 8fba54ae authored by Miklos Szeredi's avatar Miklos Szeredi
Browse files

fuse: direct-io: don't dirty ITER_BVEC pages

When reading from a loop device backed by a fuse file it deadlocks on

This is because the page is already locked by the read() operation done on
the loop device.  In this case we don't want to either lock the page or
dirty it.

So do what fs/direct-io.c does: only dirty the page for ITER_IOVEC vectors.
Reported-by: default avatarSheng Yang <>
Fixes: aa4d8616

 ("block: loop: switch to VFS ITER_BVEC")
Signed-off-by: default avatarMiklos Szeredi <>
Cc: <> # v4.1+
Reviewed-by: default avatarSheng Yang <>
Reviewed-by: default avatarAshish Samant <>
Tested-by: default avatarSheng Yang <>
Tested-by: default avatarAshish Samant <>
parent fa8410b3
......@@ -530,13 +530,13 @@ void fuse_read_fill(struct fuse_req *req, struct file *file, loff_t pos,
req->out.args[0].size = count;
static void fuse_release_user_pages(struct fuse_req *req, int write)
static void fuse_release_user_pages(struct fuse_req *req, bool should_dirty)
unsigned i;
for (i = 0; i < req->num_pages; i++) {
struct page *page = req->pages[i];
if (write)
if (should_dirty)
......@@ -1320,6 +1320,7 @@ ssize_t fuse_direct_io(struct fuse_io_priv *io, struct iov_iter *iter,
loff_t *ppos, int flags)
int write = flags & FUSE_DIO_WRITE;
bool should_dirty = !write && iter_is_iovec(iter);
int cuse = flags & FUSE_DIO_CUSE;
struct file *file = io->file;
struct inode *inode = file->f_mapping->host;
......@@ -1363,7 +1364,7 @@ ssize_t fuse_direct_io(struct fuse_io_priv *io, struct iov_iter *iter,
nres = fuse_send_read(req, io, pos, nbytes, owner);
if (!io->async)
fuse_release_user_pages(req, !write);
fuse_release_user_pages(req, should_dirty);
if (req->out.h.error) {
err = req->out.h.error;
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