From 05b27be3f86568266374a47feb05d7cce50905e5 Mon Sep 17 00:00:00 2001 From: Eric Sandeen Date: Wed, 7 Aug 2024 16:57:06 +0900 Subject: [PATCH] exfat: Convert to new uid/gid option parsing helpers Convert to new uid/gid option parsing helpers Signed-off-by: Eric Sandeen Link: https://lore.kernel.org/r/dda575de-11a7-4139-8a25-07957d311ed3@redhat.com Signed-off-by: Christian Brauner Signed-off-by: Namjae Jeon --- super.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/super.c b/super.c index 7c319d9..ae9bfaf 100644 --- a/super.c +++ b/super.c @@ -234,8 +234,13 @@ static const struct constant_table exfat_param_enums[] = { }; static const struct fs_parameter_spec exfat_parameters[] = { +#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 11, 0) + fsparam_uid("uid", Opt_uid), + fsparam_gid("gid", Opt_gid), +#else fsparam_u32("uid", Opt_uid), fsparam_u32("gid", Opt_gid), +#endif fsparam_u32oct("umask", Opt_umask), fsparam_u32oct("dmask", Opt_dmask), fsparam_u32oct("fmask", Opt_fmask), @@ -271,10 +276,18 @@ static int exfat_parse_param(struct fs_context *fc, struct fs_parameter *param) switch (opt) { case Opt_uid: +#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 11, 0) + opts->fs_uid = result.uid; +#else opts->fs_uid = make_kuid(current_user_ns(), result.uint_32); +#endif break; case Opt_gid: +#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 11, 0) + opts->fs_gid = result.gid; +#else opts->fs_gid = make_kgid(current_user_ns(), result.uint_32); +#endif break; case Opt_umask: opts->fs_fmask = result.uint_32;