ntfs3: Convert to new uid/gid option parsing helpers

Convert to new uid/gid option parsing helpers

Signed-off-by: Eric Sandeen <sandeen@redhat.com>
Link: https://lore.kernel.org/r/04bf30db-8542-48dc-9060-7f7dc08eda22@redhat.com
Signed-off-by: Christian Brauner <brauner@kernel.org>

diff --git a/fs/ntfs3/super.c b/fs/ntfs3/super.c
index 27fbde2701b63497fb5949e378c550cf38cbf3e8..c5b688c5f9845d412685d2421442d0adc585462c 100644 (file)
--- a/fs/ntfs3/super.c
+++ b/fs/ntfs3/super.c
@@ -259,8 +259,8 @@ enum Opt {
 
 // clang-format off
 static const struct fs_parameter_spec ntfs_fs_parameters[] = {
-       fsparam_u32("uid",                      Opt_uid),
-       fsparam_u32("gid",                      Opt_gid),
+       fsparam_uid("uid",                      Opt_uid),
+       fsparam_gid("gid",                      Opt_gid),
        fsparam_u32oct("umask",                 Opt_umask),
        fsparam_u32oct("dmask",                 Opt_dmask),
        fsparam_u32oct("fmask",                 Opt_fmask),
@@ -319,14 +319,10 @@ static int ntfs_fs_parse_param(struct fs_context *fc,
 
        switch (opt) {
        case Opt_uid:
-               opts->fs_uid = make_kuid(current_user_ns(), result.uint_32);
-               if (!uid_valid(opts->fs_uid))
-                       return invalf(fc, "ntfs3: Invalid value for uid.");
+               opts->fs_uid = result.uid;
                break;
        case Opt_gid:
-               opts->fs_gid = make_kgid(current_user_ns(), result.uint_32);
-               if (!gid_valid(opts->fs_gid))
-                       return invalf(fc, "ntfs3: Invalid value for gid.");
+               opts->fs_gid = result.gid;
                break;
        case Opt_umask:
                if (result.uint_32 & ~07777)