Received: by 2002:ac0:e34a:0:0:0:0:0 with SMTP id g10csp85876imn; Tue, 26 Jul 2022 23:48:51 -0700 (PDT) X-Google-Smtp-Source: AGRyM1uPEQwR0xUojvWcfrhKUw7iZefBUeOjM462y7V7RtYGumxZ3gdLsD4W0eGDLg0zONpJVHzI X-Received: by 2002:a17:902:e946:b0:16d:d16:e010 with SMTP id b6-20020a170902e94600b0016d0d16e010mr20748113pll.86.1658904531269; Tue, 26 Jul 2022 23:48:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1658904531; cv=none; d=google.com; s=arc-20160816; b=W4rkrRCkuFwZiUlpmN6zbx8lFJHWkmKBL5GsIWAiDZgajINSzfFQaqnrPJkkZ7GGqv PVMFyGJNPONFU2GN4GxxRBPuKqoEg3P/4tICg5goX6OwbQp7LoYWEobJSC+Eg7F1VcRH jgdi5sMohDmChxRQCRUU6Gg1Yp9wQxqykKw6qibs3NNP7SrMZCaZuwxBTZcigIRhfUTZ K+SGMOar/bhDIAjsJkq/w047BNY5R1xDlM6kq+mT6gFtKh5dx6OIigjHZOlEa2gVJRYN CNPnGfQ6GCEJjxlHv0MT7xONvEfYWhyhJBM5BnW/rklIgZ6eorkxoe5f3XsUNaceHuKV uMVA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=XDNROrSqKzyA1L1M+SB07diVx6X/b8xPoeGY/Lj78Aw=; b=FT3A+AMI83eWgHz5BNQxAO5atlJ2rowE2NVYLlW5FLRJJPfNKclDDV6CHnbpQvUlTT aBEJUP6VQFg51Pe5skrApzZd6DNmjjYcjhq2CJXh7/DBDXvq0XGA6sb48H7Vd92vQAbT QIQlKvGMZLDeUm0637NXqmzRngYXaES+xy4mIAvPLOzt0XNeF0IwZtMfPVX4+l1UyPLe KKrOscNYoOWqQSJoS0YWaMVeP1HflZOgnoUCBymH/v32vjQDK21Gy6f2u9o1dqAz2HJ0 /nh9F/DxxlKyDMhdB8lpuHF6bUI2n4IfYUUBxVnw+O9WL+fEJ8yGRaOpWq0A8h259rZp 1J1Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=GpIKOXIW; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id z7-20020a623307000000b0052b40ddaec6si18301412pfz.203.2022.07.26.23.48.35; Tue, 26 Jul 2022 23:48:51 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=GpIKOXIW; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231134AbiG0Gpv (ORCPT + 99 others); Wed, 27 Jul 2022 02:45:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53780 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230286AbiG0Gov (ORCPT ); Wed, 27 Jul 2022 02:44:51 -0400 Received: from mail-pj1-x1031.google.com (mail-pj1-x1031.google.com [IPv6:2607:f8b0:4864:20::1031]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0695841D14 for ; Tue, 26 Jul 2022 23:44:48 -0700 (PDT) Received: by mail-pj1-x1031.google.com with SMTP id 15-20020a17090a098f00b001f305b453feso1226597pjo.1 for ; Tue, 26 Jul 2022 23:44:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=XDNROrSqKzyA1L1M+SB07diVx6X/b8xPoeGY/Lj78Aw=; b=GpIKOXIWUDtcIO0SokOTsUOk5j320G3Xti70ANRzozbGTAoONxsCskms0m1FM4iZax G8CG/9OK5j7tfbvPwFjAeFpGnWSaw98voWkjYrIckmrR1TWV33Imol32Bkn4T91gRG59 Xq2O02ojrRvXM9jgOBn6/uYONtxri39d1GPMU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=XDNROrSqKzyA1L1M+SB07diVx6X/b8xPoeGY/Lj78Aw=; b=QTym68pVm4Zq+Doo5HvIe/v6pDjkAwFUwmtajty6Dq+Pu6HE0R8G581LoEmZmQmOmK c7xxJzmLQGbNSg1R0TqgvhY06RY373BEo0Wc1S4UO+ePHFZPuO+aP2nM5tHRq6MIK5d5 7vZdAepdNFQsAyDksYNh+YHY6mEV+VkxepoOomGzLWYGO+Z4P+1USddGePqsexp69LXM 8B8Hlf4mP9B0Ej0W23shO0cEdYlR1YYVVgKcwLKtynpDcVVpXL9ys0WriVWU0s7tkQyP c492fBgBw5HVGRSiOczQO2TFtuNadG27DMvktDFS9/Ck8eOi1pA/YZq40zidckO1xmCf 5eyg== X-Gm-Message-State: AJIora/xn8ulU4ifiZ9a6847xyDmQz96cBSCbtCyq6gXJf3+9iiqI+KK N17aH95k2nu6u/O9atZ6RF4Smg== X-Received: by 2002:a17:902:a382:b0:16d:b787:9e86 with SMTP id x2-20020a170902a38200b0016db7879e86mr374930pla.105.1658904287478; Tue, 26 Jul 2022 23:44:47 -0700 (PDT) Received: from dlunevwfh.roam.corp.google.com (n122-107-196-14.sbr2.nsw.optusnet.com.au. [122.107.196.14]) by smtp.gmail.com with ESMTPSA id f4-20020a170902684400b0016bdf0032b9sm12627001pln.110.2022.07.26.23.44.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Jul 2022 23:44:47 -0700 (PDT) From: Daniil Lunev To: Miklos Szeredi , Alexander Viro Cc: linux-fsdevel@vger.kernel.org, fuse-devel@lists.sourceforge.net, Christoph Hellwig , linux-kernel@vger.kernel.org, Daniil Lunev Subject: [PATCH v5 2/2] FUSE: Retire block-device-based superblock on force unmount Date: Wed, 27 Jul 2022 16:44:25 +1000 Message-Id: <20220727164328.v5.2.Ia8e6b14cb01caf13a4290236e37b04dff5626bc7@changeid> X-Mailer: git-send-email 2.31.0 In-Reply-To: <20220727064425.4144478-1-dlunev@chromium.org> References: <20220727064425.4144478-1-dlunev@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Force unmount of FUSE severes the connection with the user space, even if there are still open files. Subsequent remount tries to re-use the superblock held by the open files, which is meaningless in the FUSE case after disconnect - reused super block doesn't have userspace counterpart attached to it and is incapable of doing any IO. This patch adds the functionality only for the block-device-based supers, since the primary use case of the feature is to gracefully handle force unmount of external devices, mounted with FUSE. This can be further extended to cover all superblocks, if the need arises. Signed-off-by: Daniil Lunev --- Changes in v5: - Restrict retire_super call in FUSE to be issued for fuseblk only. - Commit message Changes in v2: - Use an exported function instead of directly modifying superblock fs/fuse/inode.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/fs/fuse/inode.c b/fs/fuse/inode.c index 8c0665c5dff88..9e931f53794bb 100644 --- a/fs/fuse/inode.c +++ b/fs/fuse/inode.c @@ -476,8 +476,14 @@ static void fuse_umount_begin(struct super_block *sb) { struct fuse_conn *fc = get_fuse_conn_super(sb); - if (!fc->no_force_umount) - fuse_abort_conn(fc); + if (fc->no_force_umount) + return; + + fuse_abort_conn(fc); + + // Only retire block-device-based superblocks. + if (sb->s_bdev != NULL) + retire_super(sb); } static void fuse_send_destroy(struct fuse_mount *fm) -- 2.31.0