From patchwork Tue Sep 7 15:35:53 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kari Argillander X-Patchwork-Id: 12478997 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 446EFC433F5 for ; Tue, 7 Sep 2021 15:36:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 3038D61051 for ; Tue, 7 Sep 2021 15:36:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345497AbhIGPhf (ORCPT ); Tue, 7 Sep 2021 11:37:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58726 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345444AbhIGPh3 (ORCPT ); Tue, 7 Sep 2021 11:37:29 -0400 Received: from mail-lj1-x235.google.com (mail-lj1-x235.google.com [IPv6:2a00:1450:4864:20::235]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2C31EC0617AD; Tue, 7 Sep 2021 08:36:21 -0700 (PDT) Received: by mail-lj1-x235.google.com with SMTP id g14so17229075ljk.5; Tue, 07 Sep 2021 08:36:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=OHuhtZ/zqVhWYfOx8LjsJO6P40iCzJqotJXfGUPKwnc=; b=B0F59id0u0nQtOm/ocn6TOkyxUaIoHlZF8W4Kgpux2eNqZR102GqOYBo1PtrOp/oHe 75CzGemW4B6iq/Z/6ypGu8xRBajPa5wuU9sE2lD1iBiyKnSmXSfRH9sjoUviGgRM8Mf/ jn2s3PlkTaM++9Fl6Wx8qm4xT/2h3coJ+Gmx0wkFuZQh4CbWw9FET8TAv9hMJ/x2z0q5 b2qhyraivB3dg0qqlOdaxH/w8yZ5Kjr1r6N8gbM2cPAXi1Dn83sxIc8GBMaXhUOUMxUI kppITuXWhZWGoLB0GY64Y4kcUFk4jvvRSLVrnOdR1EC7yTBvOlfs+2JkhjpFupXpQDFa 2nDw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=OHuhtZ/zqVhWYfOx8LjsJO6P40iCzJqotJXfGUPKwnc=; b=awhvoTxm1YAFCXKrpSk+ZW+qvvF01YBunXI+TBmQDc7GwuD0W4867kiTvfhebz5bFn 786bFE0A2J/3okEsSAy0bg7jLMXd6/GUKdtSjSDzB3HOMOhIn2ZLXNPWuFE4at4LUGYz I47EDGx83yzueUiqDfCzcNexpQ/4dm36QzNa8JoAdG/OgLJs3JJfhzSzcGjHzx4XdjKn 2TQ/Ei0/eb5TEBVG40P4LjRM4jTRFY2GBzfo2KOHuEDXOLd8jOgWqCUjkJPRPjzPI5SQ 3JRnjx03dbSGr44DIIEpYo8i85TIDmBUSOTjs33g9axHL+WgAKC2Tc00oG+gHOSJ+uz4 nSuQ== X-Gm-Message-State: AOAM530CFHLvpzSyG2ESJB2GMxYXkIVlsQ3rDS2XvR5jMQbpSPCBw5wS XZM+8wpoA1oU3IG+v7XfrxQ= X-Google-Smtp-Source: ABdhPJxIaHNrWfDtCM7EkmVxUJdKBYe5MzWlSTR6eQZpDWxOt0nYpNX0gUqMRMVAUaMVi6UJW9ldcw== X-Received: by 2002:a2e:8810:: with SMTP id x16mr15537678ljh.410.1631028978113; Tue, 07 Sep 2021 08:36:18 -0700 (PDT) Received: from kari-VirtualBox.telewell.oy ([31.132.12.44]) by smtp.gmail.com with ESMTPSA id p14sm1484458lji.56.2021.09.07.08.36.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Sep 2021 08:36:17 -0700 (PDT) From: Kari Argillander To: Konstantin Komarov , ntfs3@lists.linux.dev Cc: Kari Argillander , Christoph Hellwig , linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, =?utf-8?q?Pali_Roh=C3=A1r?= , Matthew Wilcox , Christian Brauner Subject: [PATCH v4 5/9] fs/ntfs3: Init spi more in init_fs_context than fill_super Date: Tue, 7 Sep 2021 18:35:53 +0300 Message-Id: <20210907153557.144391-6-kari.argillander@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210907153557.144391-1-kari.argillander@gmail.com> References: <20210907153557.144391-1-kari.argillander@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org init_fs_context() is meant to initialize s_fs_info (spi). Move spi initializing code there which we can initialize before fill_super(). Signed-off-by: Kari Argillander --- fs/ntfs3/super.c | 41 ++++++++++++++++++++++------------------- 1 file changed, 22 insertions(+), 19 deletions(-) diff --git a/fs/ntfs3/super.c b/fs/ntfs3/super.c index befa78d3cb26..420cd1409170 100644 --- a/fs/ntfs3/super.c +++ b/fs/ntfs3/super.c @@ -887,7 +887,7 @@ static int ntfs_fill_super(struct super_block *sb, struct fs_context *fc) const struct VOLUME_INFO *info; u32 idx, done, bytes; struct ATTR_DEF_ENTRY *t; - u16 *upcase = NULL; + u16 *upcase; u16 *shared; bool is_ro; struct MFT_REF ref; @@ -902,9 +902,6 @@ static int ntfs_fill_super(struct super_block *sb, struct fs_context *fc) sb->s_time_gran = NTFS_TIME_GRAN; // 100 nsec sb->s_xattr = ntfs_xattr_handlers; - ratelimit_state_init(&sbi->msg_ratelimit, DEFAULT_RATELIMIT_INTERVAL, - DEFAULT_RATELIMIT_BURST); - sbi->options->nls = ntfs_load_nls(sbi->options->nls_name); if (IS_ERR(sbi->options->nls)) { sbi->options->nls = NULL; @@ -934,12 +931,6 @@ static int ntfs_fill_super(struct super_block *sb, struct fs_context *fc) sb->s_maxbytes = 0xFFFFFFFFull << sbi->cluster_bits; #endif - mutex_init(&sbi->compress.mtx_lznt); -#ifdef CONFIG_NTFS3_LZX_XPRESS - mutex_init(&sbi->compress.mtx_xpress); - mutex_init(&sbi->compress.mtx_lzx); -#endif - /* * Load $Volume. This should be done before $LogFile * 'cause 'sbi->volume.ni' is used 'ntfs_set_state'. @@ -1224,11 +1215,7 @@ static int ntfs_fill_super(struct super_block *sb, struct fs_context *fc) goto out; } - sbi->upcase = upcase = kvmalloc(0x10000 * sizeof(short), GFP_KERNEL); - if (!upcase) { - err = -ENOMEM; - goto out; - } + upcase = sbi->upcase; for (idx = 0; idx < (0x10000 * sizeof(short) >> PAGE_SHIFT); idx++) { const __le16 *src; @@ -1440,10 +1427,21 @@ static int ntfs_init_fs_context(struct fs_context *fc) goto ok; sbi = kzalloc(sizeof(struct ntfs_sb_info), GFP_NOFS); - if (!sbi) { - kfree(opts); - return -ENOMEM; - } + if (!sbi) + goto free_opts; + + sbi->upcase = kvmalloc(0x10000 * sizeof(short), GFP_KERNEL); + if (!sbi->upcase) + goto free_sbi; + + ratelimit_state_init(&sbi->msg_ratelimit, DEFAULT_RATELIMIT_INTERVAL, + DEFAULT_RATELIMIT_BURST); + + mutex_init(&sbi->compress.mtx_lznt); +#ifdef CONFIG_NTFS3_LZX_XPRESS + mutex_init(&sbi->compress.mtx_xpress); + mutex_init(&sbi->compress.mtx_lzx); +#endif sbi->options = opts; fc->s_fs_info = sbi; @@ -1452,6 +1450,11 @@ static int ntfs_init_fs_context(struct fs_context *fc) fc->ops = &ntfs_context_ops; return 0; +free_opts: + kfree(opts); +free_sbi: + kfree(sbi); + return -ENOMEM; } // clang-format off