Commit 16b3dbfb authored by Konstantin Komarov's avatar Konstantin Komarov

fs/ntfs3: Add missed "nocase" in ntfs_show_options

Sort processing ntfs3's mount options in same order they declared.
Signed-off-by: default avatarKonstantin Komarov <almaz.alexandrovich@paragon-software.com>
parent 96de65a9
...@@ -270,11 +270,11 @@ static const struct fs_parameter_spec ntfs_fs_parameters[] = { ...@@ -270,11 +270,11 @@ static const struct fs_parameter_spec ntfs_fs_parameters[] = {
fsparam_flag_no("hidden", Opt_nohidden), fsparam_flag_no("hidden", Opt_nohidden),
fsparam_flag_no("hide_dot_files", Opt_hide_dot_files), fsparam_flag_no("hide_dot_files", Opt_hide_dot_files),
fsparam_flag_no("windows_names", Opt_windows_names), fsparam_flag_no("windows_names", Opt_windows_names),
fsparam_flag_no("acl", Opt_acl),
fsparam_flag_no("showmeta", Opt_showmeta), fsparam_flag_no("showmeta", Opt_showmeta),
fsparam_flag_no("acl", Opt_acl),
fsparam_string("iocharset", Opt_iocharset),
fsparam_flag_no("prealloc", Opt_prealloc), fsparam_flag_no("prealloc", Opt_prealloc),
fsparam_flag_no("nocase", Opt_nocase), fsparam_flag_no("nocase", Opt_nocase),
fsparam_string("iocharset", Opt_iocharset),
{} {}
}; };
...@@ -364,6 +364,9 @@ static int ntfs_fs_parse_param(struct fs_context *fc, ...@@ -364,6 +364,9 @@ static int ntfs_fs_parse_param(struct fs_context *fc,
case Opt_windows_names: case Opt_windows_names:
opts->windows_names = result.negated ? 0 : 1; opts->windows_names = result.negated ? 0 : 1;
break; break;
case Opt_showmeta:
opts->showmeta = result.negated ? 0 : 1;
break;
case Opt_acl: case Opt_acl:
if (!result.negated) if (!result.negated)
#ifdef CONFIG_NTFS3_FS_POSIX_ACL #ifdef CONFIG_NTFS3_FS_POSIX_ACL
...@@ -375,9 +378,6 @@ static int ntfs_fs_parse_param(struct fs_context *fc, ...@@ -375,9 +378,6 @@ static int ntfs_fs_parse_param(struct fs_context *fc,
else else
fc->sb_flags &= ~SB_POSIXACL; fc->sb_flags &= ~SB_POSIXACL;
break; break;
case Opt_showmeta:
opts->showmeta = result.negated ? 0 : 1;
break;
case Opt_iocharset: case Opt_iocharset:
kfree(opts->nls_name); kfree(opts->nls_name);
opts->nls_name = param->string; opts->nls_name = param->string;
...@@ -547,34 +547,36 @@ static int ntfs_show_options(struct seq_file *m, struct dentry *root) ...@@ -547,34 +547,36 @@ static int ntfs_show_options(struct seq_file *m, struct dentry *root)
seq_printf(m, ",uid=%u", from_kuid_munged(user_ns, opts->fs_uid)); seq_printf(m, ",uid=%u", from_kuid_munged(user_ns, opts->fs_uid));
seq_printf(m, ",gid=%u", from_kgid_munged(user_ns, opts->fs_gid)); seq_printf(m, ",gid=%u", from_kgid_munged(user_ns, opts->fs_gid));
if (opts->fmask)
seq_printf(m, ",fmask=%04o", opts->fs_fmask_inv ^ 0xffff);
if (opts->dmask) if (opts->dmask)
seq_printf(m, ",dmask=%04o", opts->fs_dmask_inv ^ 0xffff); seq_printf(m, ",dmask=%04o", opts->fs_dmask_inv ^ 0xffff);
if (opts->nls) if (opts->fmask)
seq_printf(m, ",iocharset=%s", opts->nls->charset); seq_printf(m, ",fmask=%04o", opts->fs_fmask_inv ^ 0xffff);
else
seq_puts(m, ",iocharset=utf8");
if (opts->sys_immutable) if (opts->sys_immutable)
seq_puts(m, ",sys_immutable"); seq_puts(m, ",sys_immutable");
if (opts->discard) if (opts->discard)
seq_puts(m, ",discard"); seq_puts(m, ",discard");
if (opts->force)
seq_puts(m, ",force");
if (opts->sparse) if (opts->sparse)
seq_puts(m, ",sparse"); seq_puts(m, ",sparse");
if (opts->showmeta)
seq_puts(m, ",showmeta");
if (opts->nohidden) if (opts->nohidden)
seq_puts(m, ",nohidden"); seq_puts(m, ",nohidden");
if (opts->windows_names)
seq_puts(m, ",windows_names");
if (opts->hide_dot_files) if (opts->hide_dot_files)
seq_puts(m, ",hide_dot_files"); seq_puts(m, ",hide_dot_files");
if (opts->force) if (opts->windows_names)
seq_puts(m, ",force"); seq_puts(m, ",windows_names");
if (opts->prealloc) if (opts->showmeta)
seq_puts(m, ",prealloc"); seq_puts(m, ",showmeta");
if (sb->s_flags & SB_POSIXACL) if (sb->s_flags & SB_POSIXACL)
seq_puts(m, ",acl"); seq_puts(m, ",acl");
if (opts->nls)
seq_printf(m, ",iocharset=%s", opts->nls->charset);
else
seq_puts(m, ",iocharset=utf8");
if (opts->prealloc)
seq_puts(m, ",prealloc");
if (opts->nocase)
seq_puts(m, ",nocase");
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment