From patchwork Wed Sep 13 11:09:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 139040 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:a8d:b0:3f2:4152:657d with SMTP id gr13csp25432vqb; Wed, 13 Sep 2023 12:06:39 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFZSmuIw3MrJgn2N+94X4YGowhpjdPdCcGt2xizBpEAdUM1NKNk+qw58UMVWgyM2UMbB4IB X-Received: by 2002:a17:90a:8a09:b0:26b:c5b:bb44 with SMTP id w9-20020a17090a8a0900b0026b0c5bbb44mr3070424pjn.13.1694631999390; Wed, 13 Sep 2023 12:06:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694631999; cv=none; d=google.com; s=arc-20160816; b=OM8zwRnsu2mk7xY7EMXUjy2u/xx39R0G9OEXmS6OXLeNWBuL1KIphwPPgIpClxCrml FHTpx5f2KGnUn5ceN7qzRFL82OrtTQ66erok3JUBaf+8gbsDCMK5hWqg/e/k5JTgZLzL azsgR3dYzSA8AAbDoafO8Rl88bZ3qP837aZQaTV2TnX8M54VzPG+wFmoCIOLp8OwJjr0 PWkGUvVH2LvdhLCXfCustlqZ4VEqve2wj276aHwd0SHYisw/FYnJKVAu60xZQc6T3xnw nf0cy3CT5rwmcou1fN5q0a7gNgfQ+mF4vpbrK/vjUEUfLLw85twK5C6vjxEaxFPZy6JU GpIQ== 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=OvdbcAa8gNPLTScw30C0haUonfkOP4Sq+9lSIjPBcA4=; fh=BKhaubn3NgfOFdJuURkVVw5laQp2qzBZJf/ffKnJtu8=; b=bKWpTJvyLokZcEgp5czT0lBvuPMfKq7JoNEz+WG2+3FBdeSDyHEqw09EPB1uWLVyso P/eUaqeNnEsqZ2+l7hbHYj339/Kc/aFb4BmnuaQLvEYcmOHjhSKT8dVp33XzmWNuJS0l YTRLCecCQQxadDulk9meJQuBRmNHGGvD5x/C7e+4WZcJpUx21tLPl4r757gPpraB1UuR hE86Lle6/q99m6XwEJAtw91Zl/SZ4FMBgX5L0+j2xzfpgODGlTV/kVX7Y0FiA7Ged5LL zJfmM0YkCw9WxIa/hcGnvx73pOQG+gJUbosn94HsF3O4N4afrKzcwFCd4AQbmepWEuUk xEow== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20210309 header.b=BepW6GlQ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:1 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from morse.vger.email (morse.vger.email. [2620:137:e000::3:1]) by mx.google.com with ESMTPS id y9-20020a17090a104900b0026813cd5719si2023123pjd.128.2023.09.13.12.06.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Sep 2023 12:06:39 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:1 as permitted sender) client-ip=2620:137:e000::3:1; Authentication-Results: mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20210309 header.b=BepW6GlQ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:1 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by morse.vger.email (Postfix) with ESMTP id E13B980B9916; Wed, 13 Sep 2023 04:11:04 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at morse.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239926AbjIMLKy (ORCPT + 36 others); Wed, 13 Sep 2023 07:10:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57404 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239909AbjIMLKx (ORCPT ); Wed, 13 Sep 2023 07:10:53 -0400 Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:3::133]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B606B19A6; Wed, 13 Sep 2023 04:10:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender :Reply-To:Content-Type:Content-ID:Content-Description; bh=OvdbcAa8gNPLTScw30C0haUonfkOP4Sq+9lSIjPBcA4=; b=BepW6GlQfs7UxJI49kYyTOBmOn io8rCiqoTN82fVhijBrxmh9o1TdkMXRsiAIwB5vFZMJHLLxr+CTkE5IT0bezBvw5XQkYmxJamyO7r VERBZCQvvADhWdAfiqojvZf61y+XfcgyFv5rOelIFAgst08ZgJMWU4IlV3C9vz/DA8lzKsDDcCi4x nTdjEjDz27Hb9ZI3K+FLVKG+rRX6BnVjvMb0SMmENeAYOBDB/ReOHHJhruLn67W3hQYc9BTZSJA4k vinBnybR1nUaX6WOMp85Fn/1tILifgOb74k8iOy2N+OpXTds6npnQN1TjbBmF5AD+WCPStHhmQgb2 vXoPOUQw==; Received: from [190.210.221.22] (helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.96 #2 (Red Hat Linux)) id 1qgNlN-005hvc-2f; Wed, 13 Sep 2023 11:10:30 +0000 From: Christoph Hellwig To: Christian Brauner , Al Viro Cc: Heiko Carstens , Vasily Gorbik , Alexander Gordeev , Fenghua Yu , Reinette Chatre , Miquel Raynal , Richard Weinberger , Vignesh Raghavendra , Dennis Dalessandro , Tejun Heo , Trond Myklebust , Anna Schumaker , Kees Cook , Damien Le Moal , Naohiro Aota , Greg Kroah-Hartman , linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, linux-s390@vger.kernel.org, linux-rdma@vger.kernel.org, linux-nfs@vger.kernel.org, linux-hardening@vger.kernel.org, cgroups@vger.kernel.org Subject: [PATCH 02/19] fs: make ->kill_sb optional Date: Wed, 13 Sep 2023 08:09:56 -0300 Message-Id: <20230913111013.77623-3-hch@lst.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230913111013.77623-1-hch@lst.de> References: <20230913111013.77623-1-hch@lst.de> MIME-Version: 1.0 X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (morse.vger.email [0.0.0.0]); Wed, 13 Sep 2023 04:11:04 -0700 (PDT) X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on morse.vger.email X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1776950442991987621 X-GMAIL-MSGID: 1776950442991987621 Call generic_shutdown_super if ->kill_sb is not provided by the file system. This can't currently happen but will become common soon. Signed-off-by: Christoph Hellwig --- fs/super.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/fs/super.c b/fs/super.c index 127a17d958a482..ab234e6af48605 100644 --- a/fs/super.c +++ b/fs/super.c @@ -483,7 +483,11 @@ void deactivate_locked_super(struct super_block *s) } unregister_shrinker(&s->s_shrink); - fs->kill_sb(s); + + if (fs->kill_sb) + fs->kill_sb(s); + else + generic_shutdown_super(s); kill_super_notify(s);