From nobody Fri Sep 12 00:29:39 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id E3870C636D4 for ; Wed, 15 Feb 2023 13:40:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230422AbjBONkJ (ORCPT ); Wed, 15 Feb 2023 08:40:09 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57466 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229518AbjBONkH (ORCPT ); Wed, 15 Feb 2023 08:40:07 -0500 Received: from relayaws-01.paragon-software.com (relayaws-01.paragon-software.com [35.157.23.187]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 033EB17176; Wed, 15 Feb 2023 05:40:00 -0800 (PST) Received: from dlg2.mail.paragon-software.com (vdlg-exch-02.paragon-software.com [172.30.1.105]) by relayaws-01.paragon-software.com (Postfix) with ESMTPS id 9EA59214E; Wed, 15 Feb 2023 13:35:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=paragon-software.com; s=mail; t=1676468148; bh=rB9oY1q3nHZkv8dcWTH7MJPs0yxT5yMPWcoRYJN6cPo=; h=Date:Subject:From:To:CC:References:In-Reply-To; b=cn/LgCeql+gT9wllgjxGK/meqSHPBA+zy76Kk67JJ9quCUT8HpNBYuHa9A6eGrnr+ EVOphhOgRmHkX8fZqsmB4/OgHRWFXezDR+Ng6RRmNiJW0APD2RuDWahNLcxnACTlPs wVvPpX9sN+e+uhQ7g4bhxjSJ9zLBwy9CU/jPrIDY= Received: from [192.168.211.36] (192.168.211.36) by vdlg-exch-02.paragon-software.com (172.30.1.105) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.7; Wed, 15 Feb 2023 16:39:58 +0300 Message-ID: <6551ad6b-9d90-edc3-920c-347a43216cd3@paragon-software.com> Date: Wed, 15 Feb 2023 17:39:57 +0400 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.7.2 Subject: [PATCH 10/11] fs/ntfs3: Add missed "nocase" in ntfs_show_options Content-Language: en-US From: Konstantin Komarov To: CC: Linux Kernel Mailing List , References: In-Reply-To: Content-Type: text/plain; charset="utf-8"; format="flowed" Content-Transfer-Encoding: quoted-printable X-Originating-IP: [192.168.211.36] X-ClientProxiedBy: vdlg-exch-02.paragon-software.com (172.30.1.105) To vdlg-exch-02.paragon-software.com (172.30.1.105) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Sort processing ntfs3's mount options in same order they declared. Signed-off-by: Konstantin Komarov --- =C2=A0fs/ntfs3/super.c | 40 +++++++++++++++++++++------------------- =C2=A01 file changed, 21 insertions(+), 19 deletions(-) diff --git a/fs/ntfs3/super.c b/fs/ntfs3/super.c index 6a412826b43d..521ce31d67a1 100644 --- a/fs/ntfs3/super.c +++ b/fs/ntfs3/super.c @@ -270,11 +270,11 @@ static const struct fs_parameter_spec=20 ntfs_fs_parameters[] =3D { =C2=A0=C2=A0=C2=A0 =C2=A0fsparam_flag_no("hidden",=C2=A0=C2=A0 =C2=A0=C2= =A0=C2=A0 =C2=A0Opt_nohidden), =C2=A0=C2=A0=C2=A0 =C2=A0fsparam_flag_no("hide_dot_files",=C2=A0=C2=A0 =C2= =A0Opt_hide_dot_files), =C2=A0=C2=A0=C2=A0 =C2=A0fsparam_flag_no("windows_names",=C2=A0=C2=A0 =C2= =A0Opt_windows_names), -=C2=A0=C2=A0 =C2=A0fsparam_flag_no("acl",=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0 = =C2=A0=C2=A0=C2=A0 =C2=A0Opt_acl), =C2=A0=C2=A0=C2=A0 =C2=A0fsparam_flag_no("showmeta",=C2=A0=C2=A0 =C2=A0=C2= =A0=C2=A0 =C2=A0Opt_showmeta), +=C2=A0=C2=A0 =C2=A0fsparam_flag_no("acl",=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0 = =C2=A0=C2=A0=C2=A0 =C2=A0Opt_acl), +=C2=A0=C2=A0 =C2=A0fsparam_string("iocharset",=C2=A0=C2=A0 =C2=A0=C2=A0=C2= =A0 =C2=A0Opt_iocharset), =C2=A0=C2=A0=C2=A0 =C2=A0fsparam_flag_no("prealloc",=C2=A0=C2=A0 =C2=A0=C2= =A0=C2=A0 =C2=A0Opt_prealloc), =C2=A0=C2=A0=C2=A0 =C2=A0fsparam_flag_no("nocase",=C2=A0=C2=A0 =C2=A0=C2= =A0=C2=A0 =C2=A0Opt_nocase), -=C2=A0=C2=A0 =C2=A0fsparam_string("iocharset",=C2=A0=C2=A0 =C2=A0=C2=A0=C2= =A0 =C2=A0Opt_iocharset), =C2=A0=C2=A0=C2=A0 =C2=A0{} =C2=A0}; @@ -364,6 +364,9 @@ static int ntfs_fs_parse_param(struct fs_context *fc, =C2=A0=C2=A0=C2=A0 =C2=A0case Opt_windows_names: =C2=A0=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0 =C2=A0opts->windows_names =3D result= .negated ? 0 : 1; =C2=A0=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0 =C2=A0break; +=C2=A0=C2=A0 =C2=A0case Opt_showmeta: +=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0 =C2=A0opts->showmeta =3D result.negated ? = 0 : 1; +=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0 =C2=A0break; =C2=A0=C2=A0=C2=A0 =C2=A0case Opt_acl: =C2=A0=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0 =C2=A0if (!result.negated) =C2=A0#ifdef CONFIG_NTFS3_FS_POSIX_ACL @@ -375,9 +378,6 @@ static int ntfs_fs_parse_param(struct fs_context *fc, =C2=A0=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0 =C2=A0else =C2=A0=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0 =C2=A0fc->sb_flag= s &=3D ~SB_POSIXACL; =C2=A0=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0 =C2=A0break; -=C2=A0=C2=A0 =C2=A0case Opt_showmeta: -=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0 =C2=A0opts->showmeta =3D result.negated ? = 0 : 1; -=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0 =C2=A0break; =C2=A0=C2=A0=C2=A0 =C2=A0case Opt_iocharset: =C2=A0=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0 =C2=A0kfree(opts->nls_name); =C2=A0=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0 =C2=A0opts->nls_name =3D param->stri= ng; @@ -547,34 +547,36 @@ static int ntfs_show_options(struct seq_file *m,=20 struct dentry *root) =C2=A0=C2=A0=C2=A0 =C2=A0seq_printf(m, ",uid=3D%u", from_kuid_munged(user_= ns, opts->fs_uid)); =C2=A0=C2=A0=C2=A0 =C2=A0seq_printf(m, ",gid=3D%u", from_kgid_munged(user_= ns, opts->fs_gid)); -=C2=A0=C2=A0 =C2=A0if (opts->fmask) -=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0 =C2=A0seq_printf(m, ",fmask=3D%04o", opts-= >fs_fmask_inv ^ 0xffff); =C2=A0=C2=A0=C2=A0 =C2=A0if (opts->dmask) =C2=A0=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0 =C2=A0seq_printf(m, ",dmask=3D%04o",= opts->fs_dmask_inv ^ 0xffff); -=C2=A0=C2=A0 =C2=A0if (opts->nls) -=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0 =C2=A0seq_printf(m, ",iocharset=3D%s", opt= s->nls->charset); -=C2=A0=C2=A0 =C2=A0else -=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0 =C2=A0seq_puts(m, ",iocharset=3Dutf8"); +=C2=A0=C2=A0 =C2=A0if (opts->fmask) +=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0 =C2=A0seq_printf(m, ",fmask=3D%04o", opts-= >fs_fmask_inv ^ 0xffff); =C2=A0=C2=A0=C2=A0 =C2=A0if (opts->sys_immutable) =C2=A0=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0 =C2=A0seq_puts(m, ",sys_immutable"); =C2=A0=C2=A0=C2=A0 =C2=A0if (opts->discard) =C2=A0=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0 =C2=A0seq_puts(m, ",discard"); +=C2=A0=C2=A0 =C2=A0if (opts->force) +=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0 =C2=A0seq_puts(m, ",force"); =C2=A0=C2=A0=C2=A0 =C2=A0if (opts->sparse) =C2=A0=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0 =C2=A0seq_puts(m, ",sparse"); -=C2=A0=C2=A0 =C2=A0if (opts->showmeta) -=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0 =C2=A0seq_puts(m, ",showmeta"); =C2=A0=C2=A0=C2=A0 =C2=A0if (opts->nohidden) =C2=A0=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0 =C2=A0seq_puts(m, ",nohidden"); -=C2=A0=C2=A0 =C2=A0if (opts->windows_names) -=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0 =C2=A0seq_puts(m, ",windows_names"); =C2=A0=C2=A0=C2=A0 =C2=A0if (opts->hide_dot_files) =C2=A0=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0 =C2=A0seq_puts(m, ",hide_dot_files"); -=C2=A0=C2=A0 =C2=A0if (opts->force) -=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0 =C2=A0seq_puts(m, ",force"); -=C2=A0=C2=A0 =C2=A0if (opts->prealloc) -=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0 =C2=A0seq_puts(m, ",prealloc"); +=C2=A0=C2=A0 =C2=A0if (opts->windows_names) +=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0 =C2=A0seq_puts(m, ",windows_names"); +=C2=A0=C2=A0 =C2=A0if (opts->showmeta) +=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0 =C2=A0seq_puts(m, ",showmeta"); =C2=A0=C2=A0=C2=A0 =C2=A0if (sb->s_flags & SB_POSIXACL) =C2=A0=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0 =C2=A0seq_puts(m, ",acl"); +=C2=A0=C2=A0 =C2=A0if (opts->nls) +=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0 =C2=A0seq_printf(m, ",iocharset=3D%s", opt= s->nls->charset); +=C2=A0=C2=A0 =C2=A0else +=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0 =C2=A0seq_puts(m, ",iocharset=3Dutf8"); +=C2=A0=C2=A0 =C2=A0if (opts->prealloc) +=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0 =C2=A0seq_puts(m, ",prealloc"); +=C2=A0=C2=A0 =C2=A0if (opts->nocase) +=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0 =C2=A0seq_puts(m, ",nocase"); =C2=A0=C2=A0=C2=A0 =C2=A0return 0; =C2=A0} --=20 2.34.1