diff options
| author | Xie Yongji <xieyongji@bytedance.com> | 2022-07-18 16:50:12 +0800 |
|---|---|---|
| committer | Miklos Szeredi <mszeredi@redhat.com> | 2022-07-21 16:06:19 +0200 |
| commit | c64797809a64c73497082aa05e401a062ec1af34 (patch) | |
| tree | 75ae2b071a48eca0059f5f68fde91b56bb4b3718 /fs/fuse | |
| parent | 02c0cab8e7345b06f1c0838df444e2902e4138d3 (diff) | |
| download | linux-stable-c64797809a64c73497082aa05e401a062ec1af34.tar.gz linux-stable-c64797809a64c73497082aa05e401a062ec1af34.tar.bz2 linux-stable-c64797809a64c73497082aa05e401a062ec1af34.zip | |
fuse: Remove the control interface for virtio-fs
The commit 15c8e72e88e0 ("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: 15c8e72e88e0 ("fuse: allow skipping control interface and forced unmount")
Signed-off-by: Xie Yongji <xieyongji@bytedance.com>
Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>
Diffstat (limited to 'fs/fuse')
| -rw-r--r-- | fs/fuse/control.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/fuse/control.c b/fs/fuse/control.c index 7cede9a3bc96..247ef4f76761 100644 --- a/fs/fuse/control.c +++ b/fs/fuse/control.c @@ -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; @@ -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--) { |