Commit 80fcbe75 authored by Eric W. Biederman's avatar Eric W. Biederman

userns: Convert omfs to use kuid and kgid where appropriate

Acked-by: default avatarBob Copeland <>
Acked-by: default avatarSerge Hallyn <>
Signed-off-by: default avatarEric W. Biederman <>
parent b29f7751
......@@ -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;
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;
case Opt_umask:
if (match_octal(&args[0], &option))
......@@ -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;
......@@ -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
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment