Received: by 2002:a05:7412:31a9:b0:e2:908c:2ebd with SMTP id et41csp3198228rdb; Wed, 13 Sep 2023 05:21:53 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHSkWfUNg/nLjbuMpCSEKS4kH5rAFwf5ZZs8HFvj3q/tp8MjHb7vw6AY8RcnQ5uVGcpaQMQ X-Received: by 2002:a05:6870:2415:b0:1d5:aed5:6579 with SMTP id n21-20020a056870241500b001d5aed56579mr2325035oap.4.1694607713658; Wed, 13 Sep 2023 05:21:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694607713; cv=none; d=google.com; s=arc-20160816; b=ggidk03d+LTf5CC5DtmnrRUJIRiZPSeGnRyLFddrUloanRUUvJXzL/WVojMNAx9HcO Xxkubj8pN3w/eTLeXqiGcb2r99WsVOnI4psa5MFqgHOy7sV6aOMsTInpFXNkzhD0+XuE YggInf3OIBZ2UfNjtmoTgoz6yzkY0uTw1ONvFWT54CGnUbxbo3KvtOmDIwvAbc3YKo/r iqM+jWiNFL7D3ZJYWdhiGc7d8bLh9GLSZCLfjN1c+rLMGZUptpqw9kmOuaIfJK7Ck8h4 jiAAo3FW+Rh4UYyVh6icSC0eLwOpDU+jrV1K+s1yt9e5LfiVf7GEcdFtuLP7FnMhnW2V Zs9A== 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:4 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from howler.vger.email (howler.vger.email. [2620:137:e000::3:4]) by mx.google.com with ESMTPS id y185-20020a638ac2000000b005774aba519dsi7022787pgd.298.2023.09.13.05.21.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Sep 2023 05:21:53 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) client-ip=2620:137:e000::3:4; 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:4 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 howler.vger.email (Postfix) with ESMTP id 909F8834A9C6; Wed, 13 Sep 2023 04:11:01 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at howler.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239924AbjIMLKy (ORCPT + 99 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 Content-Transfer-Encoding: 8bit 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 (howler.vger.email [0.0.0.0]); Wed, 13 Sep 2023 04:11:01 -0700 (PDT) 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); -- 2.39.2