Skip to content

Commit

Permalink
fuse: Remove the control interface for virtio-fs
Browse files Browse the repository at this point in the history
The commit 15c8e72 ("fuse: allow skipping control interface and forced
unmount") tries to remove the control interface for virtio-fs since it does
not support aborting requests which are being processed. But it doesn't
work now.

This patch fixes it by skipping creating the control interface if
fuse_conn->no_control is set.

Fixes: 15c8e72 ("fuse: allow skipping control interface and forced unmount")
Signed-off-by: Xie Yongji <xieyongji@bytedance.com>
Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>
  • Loading branch information
Xie Yongji authored and Miklos Szeredi committed Jul 21, 2022
1 parent 02c0cab commit c647978
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions fs/fuse/control.c
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,7 @@ int fuse_ctl_add_conn(struct fuse_conn *fc)
struct dentry *parent;
char name[32];

if (!fuse_control_sb)
if (!fuse_control_sb || fc->no_control)
return 0;

parent = fuse_control_sb->s_root;
Expand Down Expand Up @@ -296,7 +296,7 @@ void fuse_ctl_remove_conn(struct fuse_conn *fc)
{
int i;

if (!fuse_control_sb)
if (!fuse_control_sb || fc->no_control)
return;

for (i = fc->ctl_ndents - 1; i >= 0; i--) {
Expand Down

0 comments on commit c647978

Please sign in to comment.