From 91931c8d074e2a429e69e81af147c2a08f51d794 Mon Sep 17 00:00:00 2001 From: "Eric W. Biederman" Date: Tue, 7 Feb 2012 16:29:49 -0800 Subject: [PATCH] --- yaml --- r: 327293 b: refs/heads/master c: 80fcbe751f01bea34759bebd3d213c4ee244a719 h: refs/heads/master i: 327291: ecd8bf5b78e5f357f6e14ba4aef03f746703e99b v: v3 --- [refs] | 2 +- trunk/fs/omfs/inode.c | 8 ++++++-- trunk/fs/omfs/omfs.h | 4 ++-- trunk/init/Kconfig | 1 - 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 987d47460b0f..2b30e35c8875 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b29f7751c9a880e842e48f421daf313b997ddd65 +refs/heads/master: 80fcbe751f01bea34759bebd3d213c4ee244a719 diff --git a/trunk/fs/omfs/inode.c b/trunk/fs/omfs/inode.c index e6213b3725d1..25d715c7c87a 100644 --- a/trunk/fs/omfs/inode.c +++ b/trunk/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/trunk/fs/omfs/omfs.h b/trunk/fs/omfs/omfs.h index 8941f12c6b01..f0f8bc75e609 100644 --- a/trunk/fs/omfs/omfs.h +++ b/trunk/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/trunk/init/Kconfig b/trunk/init/Kconfig index 0f65a0231585..390e6295b188 100644 --- a/trunk/init/Kconfig +++ b/trunk/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