Commit bb1cc434 authored Jul 18, 2022 by Xie Yongji Committed by Greg Kroah-Hartman Aug 25, 2022

fuse: Remove the control interface for virtio-fs



[ Upstream commit c64797809a64c73497082aa05e401a062ec1af34 ]

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: Xie Yongji <xieyongji@bytedance.com>
Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

parent 08398462

fs/fuse/control.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -265,7 +265,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;
		@@ -303,7 +303,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--) {