Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Xie Yongji and committed by
Miklos Szeredi
c6479780 02c0cab8

+2 -2
+2 -2
fs/fuse/control.c
··· 258 258 struct dentry *parent; 259 259 char name[32]; 260 260 261 - if (!fuse_control_sb) 261 + if (!fuse_control_sb || fc->no_control) 262 262 return 0; 263 263 264 264 parent = fuse_control_sb->s_root; ··· 296 296 { 297 297 int i; 298 298 299 - if (!fuse_control_sb) 299 + if (!fuse_control_sb || fc->no_control) 300 300 return; 301 301 302 302 for (i = fc->ctl_ndents - 1; i >= 0; i--) {