]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
hugetlbfs: Convert to new uid/gid option parsing helpers
authorEric Sandeen <sandeen@redhat.com>
Fri, 28 Jun 2024 00:35:12 +0000 (19:35 -0500)
committerChristian Brauner <brauner@kernel.org>
Tue, 2 Jul 2024 04:21:19 +0000 (06:21 +0200)
Convert to new uid/gid option parsing helpers

Signed-off-by: Eric Sandeen <sandeen@redhat.com>
Link: https://lore.kernel.org/r/6cb0dcfd-f837-463f-b5ec-0e7d2608b837@redhat.com
Signed-off-by: Christian Brauner <brauner@kernel.org>
fs/hugetlbfs/inode.c

index 412f295acebe2e3e995557e984c04f9b7b193ad9..81dab95f67ed84dc7e8eb61d112ffc09d0b0e175 100644 (file)
@@ -73,13 +73,13 @@ enum hugetlb_param {
 };
 
 static const struct fs_parameter_spec hugetlb_fs_parameters[] = {
-       fsparam_u32   ("gid",           Opt_gid),
+       fsparam_gid   ("gid",           Opt_gid),
        fsparam_string("min_size",      Opt_min_size),
        fsparam_u32oct("mode",          Opt_mode),
        fsparam_string("nr_inodes",     Opt_nr_inodes),
        fsparam_string("pagesize",      Opt_pagesize),
        fsparam_string("size",          Opt_size),
-       fsparam_u32   ("uid",           Opt_uid),
+       fsparam_uid   ("uid",           Opt_uid),
        {}
 };
 
@@ -1376,15 +1376,11 @@ static int hugetlbfs_parse_param(struct fs_context *fc, struct fs_parameter *par
 
        switch (opt) {
        case Opt_uid:
-               ctx->uid = make_kuid(current_user_ns(), result.uint_32);
-               if (!uid_valid(ctx->uid))
-                       goto bad_val;
+               ctx->uid = result.uid;
                return 0;
 
        case Opt_gid:
-               ctx->gid = make_kgid(current_user_ns(), result.uint_32);
-               if (!gid_valid(ctx->gid))
-                       goto bad_val;
+               ctx->gid = result.gid;
                return 0;
 
        case Opt_mode: