From nobody Mon Sep 29 21:22:19 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id F2078C00140 for ; Tue, 16 Aug 2022 00:49:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243688AbiHPAtX (ORCPT ); Mon, 15 Aug 2022 20:49:23 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56898 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1346890AbiHPAps (ORCPT ); Mon, 15 Aug 2022 20:45:48 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3847739B96; Mon, 15 Aug 2022 13:42:13 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id DEFE8B8113E; Mon, 15 Aug 2022 20:42:11 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2280BC433D6; Mon, 15 Aug 2022 20:42:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1660596130; bh=iLeyVKw30Yurlo2472vxw9O6/4uq54uc70v/ViiSn4M=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bxEvkxxq2Bt+7okCal0yYQRDs/IUpaUUnlHTlRlYsJ+IRNgc0CNbhAwuT+NhBW3+5 vliFRxFUDbzjMlfO5QPt7DSGOqVV91TVAsi/i5tTqAeDbsB7mceSXqX1lSNui8BNbs SZleGU7MnYKVWBvKo+EeAVtBYT3wEwT1xoD4tvvw= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Xie Yongji , Miklos Szeredi , Sasha Levin Subject: [PATCH 5.19 0983/1157] fuse: Remove the control interface for virtio-fs Date: Mon, 15 Aug 2022 20:05:39 +0200 Message-Id: <20220815180519.056755357@linuxfoundation.org> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220815180439.416659447@linuxfoundation.org> References: <20220815180439.416659447@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Xie Yongji [ Upstream commit c64797809a64c73497082aa05e401a062ec1af34 ] 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 unm= ount") Signed-off-by: Xie Yongji Signed-off-by: Miklos Szeredi Signed-off-by: Sasha Levin --- fs/fuse/control.c | 4 ++-- 1 file 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]; =20 - if (!fuse_control_sb) + if (!fuse_control_sb || fc->no_control) return 0; =20 parent =3D fuse_control_sb->s_root; @@ -296,7 +296,7 @@ void fuse_ctl_remove_conn(struct fuse_conn *fc) { int i; =20 - if (!fuse_control_sb) + if (!fuse_control_sb || fc->no_control) return; =20 for (i =3D fc->ctl_ndents - 1; i >=3D 0; i--) { --=20 2.35.1