From patchwork Wed May 31 09:57:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Qi Zheng X-Patchwork-Id: 101313 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp2766081vqr; Wed, 31 May 2023 03:14:21 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6as3C+QZScp2VM2Y//IPQkngB7ML2emF46t5e5s5AGE1CytuA2u2GY/BuJkhm/urr22GWp X-Received: by 2002:a05:6870:628a:b0:19f:6af1:87f8 with SMTP id s10-20020a056870628a00b0019f6af187f8mr2783777oan.41.1685528061121; Wed, 31 May 2023 03:14:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685528061; cv=none; d=google.com; s=arc-20160816; b=aBAssuS76aUagEWItFiz4JgyULUvwUAFxJfYx2XItp8HFyiu7OW0N5Hxei01Y8Q7MR Qkwxpb6hzoH8Rsp9c4OQ8Xwpxi5C18obW36IQ6ZcghvdeJoZxgiRkYunPz+acBhYoLUQ dHs+4rPdek0651Opz9TdPKhT35Y8re2g8siTYkfnexVypRF+n1FPz9lo8TKSSHY4AIGw plEVLxSX12+KaTdROt4RYaEDSiXxjCbnu0/y/2wbzVeYg99EMpSlohllrxQ5+Zzuh9ss 4VxjLUpSiP3bnxmRAwpsg3iNfKJt+eJDcE3Fy5pofHUoWQty1JLfds5fGJD58rdQIG7C W5UA== 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=cNetM4XBa/Gbuqkaq6l+2vD89eQsIgmLTdtu3cv7dk8=; b=o0IXozx3D/LV6a9oSL1tk57s4S3EwB/+j+r4hcojzqZw1+1wS1gcsVkPjv/wIxdKwO Arwf9Ho1EkuLcO98OltX4R7ai3Od5TKRJQnBkClP0fzYnJ5yQDS6f9jQsdAJB5532DVx rfyOkm8pYfaCM4iiBOynC0dW7LssgNUB3RER4UVT2QEWE8LbDk9t+9Bgd3n2CiCGDauY MLtvfqj2IIFa+flWNmC9fCxqj3mmo6Yn4HEE8efkk8SpuG7kMwDBJoy/zjGcYLLqnGfe o4OLLiLoMOZgKle3mBsS7wtnLo0Z+kC0PX5MMVKJ9eHAMqdoJCNEwnhv3KcS90yCVD6l z6lw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linux.dev header.s=key1 header.b=lvO7SWW0; 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=linux.dev Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id w198-20020a627bcf000000b0063b77e2123csi3280315pfc.26.2023.05.31.03.14.09; Wed, 31 May 2023 03:14:21 -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=@linux.dev header.s=key1 header.b=lvO7SWW0; 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=linux.dev Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235775AbjEaJ7V (ORCPT + 99 others); Wed, 31 May 2023 05:59:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54730 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235755AbjEaJ7M (ORCPT ); Wed, 31 May 2023 05:59:12 -0400 Received: from out-46.mta0.migadu.com (out-46.mta0.migadu.com [IPv6:2001:41d0:1004:224b::2e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7E8AD1B9 for ; Wed, 31 May 2023 02:58:48 -0700 (PDT) X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1685527125; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=cNetM4XBa/Gbuqkaq6l+2vD89eQsIgmLTdtu3cv7dk8=; b=lvO7SWW0g6amQil27w7Ch1WvlKqI4Syaj9ZKVX28hbNP7t8j4/5bAKuiTPnmEYRwcznnpM FC4tcITydxIA3hqHO31xf6p70DR7WKVF4bsUNWyhiAhBcj85YqAuj7QvPpCBdGQUEYFJeW 8/DXDI12VzN61sf4+h1P/9MfcFO1sIc= From: Qi Zheng To: akpm@linux-foundation.org, tkhai@ya.ru, roman.gushchin@linux.dev, vbabka@suse.cz, viro@zeniv.linux.org.uk, brauner@kernel.org, djwong@kernel.org, hughd@google.com, paulmck@kernel.org, muchun.song@linux.dev Cc: linux-mm@kvack.org, linux-fsdevel@vger.kernel.org, linux-xfs@vger.kernel.org, linux-kernel@vger.kernel.org, Qi Zheng Subject: [PATCH 7/8] shmem: implement shmem_destroy_super() Date: Wed, 31 May 2023 09:57:41 +0000 Message-Id: <20230531095742.2480623-8-qi.zheng@linux.dev> In-Reply-To: <20230531095742.2480623-1-qi.zheng@linux.dev> References: <20230531095742.2480623-1-qi.zheng@linux.dev> MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED 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 X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1767404272545862894?= X-GMAIL-MSGID: =?utf-8?q?1767404272545862894?= From: Kirill Tkhai Similar to xfs_fs_destroy_super() implement the method for shmem. shmem_unused_huge_count() just touches sb->s_fs_info. After such the later freeing it will be safe for unregister_shrinker() splitting (which is made in next patch). Signed-off-by: Kirill Tkhai Signed-off-by: Qi Zheng --- mm/shmem.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/mm/shmem.c b/mm/shmem.c index 71e6c9855770..a4c3fdf23838 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -3930,6 +3930,12 @@ static void shmem_put_super(struct super_block *sb) free_percpu(sbinfo->ino_batch); percpu_counter_destroy(&sbinfo->used_blocks); mpol_put(sbinfo->mpol); +} + +static void shmem_destroy_super(struct super_block *sb) +{ + struct shmem_sb_info *sbinfo = SHMEM_SB(sb); + kfree(sbinfo); sb->s_fs_info = NULL; } @@ -4018,6 +4024,7 @@ static int shmem_fill_super(struct super_block *sb, struct fs_context *fc) failed: shmem_put_super(sb); + shmem_destroy_super(sb); return -ENOMEM; } @@ -4182,6 +4189,7 @@ static const struct super_operations shmem_ops = { .evict_inode = shmem_evict_inode, .drop_inode = generic_delete_inode, .put_super = shmem_put_super, + .destroy_super = shmem_destroy_super, #ifdef CONFIG_TRANSPARENT_HUGEPAGE .nr_cached_objects = shmem_unused_huge_count, .free_cached_objects = shmem_unused_huge_scan,