userns: Convert omfs to use kuid and kgid where appropriate

Acked-by: Bob Copeland <me@bobcopeland.com>
Acked-by: Serge Hallyn <serge.hallyn@canonical.com>
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>

diff --git a/fs/omfs/inode.c b/fs/omfs/inode.c
index e6213b3725d1b60cdc0b66a40c406df1f5d401c2..25d715c7c87abdd373918da6a42489332c88e3c0 100644 (file)
--- a/fs/omfs/inode.c
+++ b/fs/omfs/inode.c
@@ -391,12 +391,16 @@ static int parse_options(char *options, struct omfs_sb_info *sbi)
                case Opt_uid:
                        if (match_int(&args[0], &option))
                                return 0;
-                       sbi->s_uid = option;
+                       sbi->s_uid = make_kuid(current_user_ns(), option);
+                       if (!uid_valid(sbi->s_uid))
+                               return 0;
                        break;
                case Opt_gid:
                        if (match_int(&args[0], &option))
                                return 0;
-                       sbi->s_gid = option;
+                       sbi->s_gid = make_kgid(current_user_ns(), option);
+                       if (!gid_valid(sbi->s_gid))
+                               return 0;
                        break;
                case Opt_umask:
                        if (match_octal(&args[0], &option))

diff --git a/fs/omfs/omfs.h b/fs/omfs/omfs.h
index 8941f12c6b01b49286733407b9e1918d968e22aa..f0f8bc75e6094fa014ab76f46bcba1f73afe3808 100644 (file)
--- a/fs/omfs/omfs.h
+++ b/fs/omfs/omfs.h
@@ -19,8 +19,8 @@ struct omfs_sb_info {
        unsigned long **s_imap;
        int s_imap_size;
        struct mutex s_bitmap_lock;
-       int s_uid;
-       int s_gid;
+       kuid_t s_uid;
+       kgid_t s_gid;
        int s_dmask;
        int s_fmask;
 };

diff --git a/init/Kconfig b/init/Kconfig
index 0f65a0231585347b7ebebd5a184aed46f3d5fe6a..390e6295b18800640482d1ca358c30328a73d81a 100644 (file)
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -950,7 +950,6 @@ config UIDGID_CONVERTED
        depends on NFSD = n
        depends on NFS_FS = n
        depends on OCFS2_FS = n
-       depends on OMFS_FS = n
        depends on QNX4FS_FS = n
        depends on QNX6FS_FS = n
        depends on REISERFS_FS = n