]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
tracefs: Convert to new uid/gid option parsing helpers
authorEric Sandeen <sandeen@redhat.com>
Fri, 28 Jun 2024 00:40:44 +0000 (19:40 -0500)
committerChristian Brauner <brauner@kernel.org>
Tue, 2 Jul 2024 04:21:20 +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/6c9b0b16-e61b-4dfc-852d-e2eb5bb11b82@redhat.com
Acked-by: Steven Rostedt (Google) <rostedt@goodmis.org>
Signed-off-by: Christian Brauner <brauner@kernel.org>
fs/tracefs/inode.c

index 7c29f4afc23d5568267cfbe7b27a6b38fac774a3..1028ab6d9a744b7dde0195b9c5e090b6e8ea2adc 100644 (file)
@@ -296,9 +296,9 @@ enum {
 };
 
 static const struct fs_parameter_spec tracefs_param_specs[] = {
-       fsparam_u32     ("gid",         Opt_gid),
+       fsparam_gid     ("gid",         Opt_gid),
        fsparam_u32oct  ("mode",        Opt_mode),
-       fsparam_u32     ("uid",         Opt_uid),
+       fsparam_uid     ("uid",         Opt_uid),
        {}
 };
 
@@ -306,8 +306,6 @@ static int tracefs_parse_param(struct fs_context *fc, struct fs_parameter *param
 {
        struct tracefs_fs_info *opts = fc->s_fs_info;
        struct fs_parse_result result;
-       kuid_t uid;
-       kgid_t gid;
        int opt;
 
        opt = fs_parse(fc, tracefs_param_specs, param, &result);
@@ -316,16 +314,10 @@ static int tracefs_parse_param(struct fs_context *fc, struct fs_parameter *param
 
        switch (opt) {
        case Opt_uid:
-               uid = make_kuid(current_user_ns(), result.uint_32);
-               if (!uid_valid(uid))
-                       return invalf(fc, "Unknown uid");
-               opts->uid = uid;
+               opts->uid = result.uid;
                break;
        case Opt_gid:
-               gid = make_kgid(current_user_ns(), result.uint_32);
-               if (!gid_valid(gid))
-                       return invalf(fc, "Unknown gid");
-               opts->gid = gid;
+               opts->gid = result.gid;
                break;
        case Opt_mode:
                opts->mode = result.uint_32 & S_IALLUGO;