Skip to content

Commit d70e8f2

Browse files
committed
Merge user/mitchelllevy/fix/fuse-hang/6.6 into v6.6.123
* commit 'a9e0ea320730017f820644deda4040d0da91bb02': fuse: mark DAX inode releases as blocking
2 parents b4532de + a9e0ea3 commit d70e8f2

1 file changed

Lines changed: 6 additions & 0 deletions

File tree

fs/fuse/file.c

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,12 @@ static void fuse_file_put(struct fuse_file *ff, bool sync)
120120
fuse_simple_request(ff->fm, args);
121121
fuse_release_end(ff->fm, args, 0);
122122
} else {
123+
/*
124+
* DAX inodes may need to issue a number of synchronous
125+
* request for clearing the mappings.
126+
*/
127+
if (ra && ra->inode && FUSE_IS_DAX(ra->inode))
128+
args->may_block = true;
123129
args->end = fuse_release_end;
124130
if (fuse_simple_background(ff->fm, args,
125131
GFP_KERNEL | __GFP_NOFAIL))

0 commit comments

Comments
 (0)