Commit c6479780 authored by Xie Yongji's avatar Xie Yongji Committed by Miklos Szeredi
Browse files

fuse: Remove the control interface for virtio-fs 



The commit 15c8e72e ("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: 15c8e72e ("fuse: allow skipping control interface and forced unmount")
Signed-off-by: default avatarXie Yongji <xieyongji@bytedance.com>
Signed-off-by: default avatarMiklos Szeredi <mszeredi@redhat.com>
parent 02c0cab8

fs/fuse/control.c

+2 −2
Original line number Diff line number Diff line
@@ -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--) {