Received: by 2002:a05:6358:11c7:b0:104:8066:f915 with SMTP id i7csp917117rwl; Fri, 7 Apr 2023 07:20:43 -0700 (PDT) X-Google-Smtp-Source: AKy350aDiYKGHzPF4IL0JPcje0eRVnMai06UhjlJpLOC3FRyoc2V2belSaB421ym7COsYxMKEoXK X-Received: by 2002:aa7:9f9b:0:b0:626:dc8:b004 with SMTP id z27-20020aa79f9b000000b006260dc8b004mr2478470pfr.26.1680877243191; Fri, 07 Apr 2023 07:20:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680877243; cv=none; d=google.com; s=arc-20160816; b=swindcAi423r/+c0MW+xpyQB+sDo7xynZFrR1u0HGIJ85dcGXs7dv7ZNgDqccsNlu3 DJyfxj1KRRwF7SudjRLuQ0JrhhMxTXJWL/9MsCZT3rO7L4w9BC2XtL9EJMvRKnUGOpNk R/hKRDyE7WVcV2rC4Z6MIOvM04bx9jnwcfZRbp6+ghw0h1ttg77f4P0SatvW3lUXhRqI 7U7seVzpRwnvXiy2Sc685lNBw3AsahS3b1hlTljDjcXSEvfne7qeSQ27XUlHNSO8G6HF /jl9NUpRhEulo5k1ACLKLvOgxB9z+MLmwbLPg+uhwjkxmq00ey4eVx4aRiZ84H0Q602r xFgg== 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; bh=bAn1bWULqnahn1KUNDW0rRW3+WcRbtQUHgKcUdvZpQc=; b=ulXyVf1BZIDSE3hcOCK6TmT8y8FBqRIfZcU8hOnTTmCaTIJchmhFvVgkuSzO/uNbVe L4n0PveCPSYYUJkh/n35M0SYNlr7a3iQ6oqly3Q+uXJVYPHJ8C92sWEXEuyLfw7X+tkM 6Z537waTZReCn4rEiLJJFQ60Fk/i1SXz0GRYIYZ0j+yfTNLUyocp2bZlbtWdrvEfeGoA wM2O52tq0vqhqQ4qw+1sOz311mdBu/zgna2wmYjM1bPJIn0Msx+kIHQdc35kfno+ivoW +/GpKFc+b0I79535Gi9dWTqS/j3st3i8Yd047AUNmIREhT29DkDGr3XSXv1+z0jAkKj1 DWJw== ARC-Authentication-Results: i=1; mx.google.com; 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=fail (p=NONE sp=NONE dis=NONE) header.from=alibaba.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id r207-20020a632bd8000000b00513dd35273dsi3626154pgr.811.2023.04.07.07.20.30; Fri, 07 Apr 2023 07:20:43 -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; 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=fail (p=NONE sp=NONE dis=NONE) header.from=alibaba.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240259AbjDGOR0 (ORCPT + 99 others); Fri, 7 Apr 2023 10:17:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36646 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231349AbjDGORS (ORCPT ); Fri, 7 Apr 2023 10:17:18 -0400 Received: from out30-124.freemail.mail.aliyun.com (out30-124.freemail.mail.aliyun.com [115.124.30.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 387876E95 for ; Fri, 7 Apr 2023 07:17:17 -0700 (PDT) X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R281e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=ay29a033018046060;MF=jefflexu@linux.alibaba.com;NM=1;PH=DS;RN=5;SR=0;TI=SMTPD_---0VfX8evk_1680877033; Received: from localhost(mailfrom:jefflexu@linux.alibaba.com fp:SMTPD_---0VfX8evk_1680877033) by smtp.aliyun-inc.com; Fri, 07 Apr 2023 22:17:13 +0800 From: Jingbo Xu To: xiang@kernel.org, chao@kernel.org, huyue2@coolpad.com, linux-erofs@lists.ozlabs.org Cc: linux-kernel@vger.kernel.org Subject: [PATCH 2/7] erofs: initialize packed inode after root inode is assigned Date: Fri, 7 Apr 2023 22:17:05 +0800 Message-Id: <20230407141710.113882-3-jefflexu@linux.alibaba.com> X-Mailer: git-send-email 2.19.1.6.gb485710b In-Reply-To: <20230407141710.113882-1-jefflexu@linux.alibaba.com> References: <20230407141710.113882-1-jefflexu@linux.alibaba.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-8.0 required=5.0 tests=ENV_AND_HDR_SPF_MATCH, RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_PASS, UNPARSEABLE_RELAY,USER_IN_DEF_SPF_WL autolearn=unavailable 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 As commit 8f7acdae2cd4 ("staging: erofs: kill all failure handling in fill_super()"), move the initialization of packed inode after root inode is assigned, so that the iput() in .put_super() is adequate as the failure handling. Otherwise, iput() is also needed in .kill_sb(), in case of the mounting fails halfway. Signed-off-by: Jingbo Xu --- fs/erofs/internal.h | 1 + fs/erofs/super.c | 22 +++++++++++----------- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/fs/erofs/internal.h b/fs/erofs/internal.h index 2bcff3194e4a..caea9dc1cd82 100644 --- a/fs/erofs/internal.h +++ b/fs/erofs/internal.h @@ -157,6 +157,7 @@ struct erofs_sb_info { /* what we really care is nid, rather than ino.. */ erofs_nid_t root_nid; + erofs_nid_t packed_nid; /* used for statfs, f_files - f_favail */ u64 inos; diff --git a/fs/erofs/super.c b/fs/erofs/super.c index 58ffbf410bfb..325602820dc8 100644 --- a/fs/erofs/super.c +++ b/fs/erofs/super.c @@ -388,17 +388,7 @@ static int erofs_read_superblock(struct super_block *sb) #endif sbi->islotbits = ilog2(sizeof(struct erofs_inode_compact)); sbi->root_nid = le16_to_cpu(dsb->root_nid); -#ifdef CONFIG_EROFS_FS_ZIP - sbi->packed_inode = NULL; - if (erofs_sb_has_fragments(sbi) && dsb->packed_nid) { - sbi->packed_inode = - erofs_iget(sb, le64_to_cpu(dsb->packed_nid)); - if (IS_ERR(sbi->packed_inode)) { - ret = PTR_ERR(sbi->packed_inode); - goto out; - } - } -#endif + sbi->packed_nid = le64_to_cpu(dsb->packed_nid); sbi->inos = le64_to_cpu(dsb->inos); sbi->build_time = le64_to_cpu(dsb->build_time); @@ -820,6 +810,16 @@ static int erofs_fc_fill_super(struct super_block *sb, struct fs_context *fc) erofs_shrinker_register(sb); /* sb->s_umount is already locked, SB_ACTIVE and SB_BORN are not set */ +#ifdef CONFIG_EROFS_FS_ZIP + if (erofs_sb_has_fragments(sbi) && sbi->packed_nid) { + sbi->packed_inode = erofs_iget(sb, sbi->packed_nid); + if (IS_ERR(sbi->packed_inode)) { + err = PTR_ERR(sbi->packed_inode); + sbi->packed_inode = NULL; + return err; + } + } +#endif err = erofs_init_managed_cache(sb); if (err) return err; -- 2.19.1.6.gb485710b