diff options
| author | Eric W. Biederman <ebiederm@xmission.com> | 2012-04-25 22:40:44 -0700 |
|---|---|---|
| committer | Eric W. Biederman <ebiederm@xmission.com> | 2012-09-21 03:13:19 -0700 |
| commit | d03ca5820d84090f47ce831df619f2fff66eb52b (patch) | |
| tree | e9211352f991d2d8579ca8650b4bf0e45870b90e | |
| parent | 2f83ffa874ccb6ea4596220188d3e54b20203124 (diff) | |
| download | linux-stable-d03ca5820d84090f47ce831df619f2fff66eb52b.tar.gz linux-stable-d03ca5820d84090f47ce831df619f2fff66eb52b.tar.bz2 linux-stable-d03ca5820d84090f47ce831df619f2fff66eb52b.zip | |
userns: Convert ipathfs to use GLOBAL_ROOT_UID and GLOBAL_ROOT_GID
Acked-by: Mike Marciniszyn <mike.marciniszyn@intel.com>
Acked-by: Serge Hallyn <serge.hallyn@canonical.com>
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
| -rw-r--r-- | drivers/infiniband/hw/qib/qib_fs.c | 4 | ||||
| -rw-r--r-- | init/Kconfig | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/drivers/infiniband/hw/qib/qib_fs.c b/drivers/infiniband/hw/qib/qib_fs.c index cff8a6c32161..65a2a23f6f8a 100644 --- a/drivers/infiniband/hw/qib/qib_fs.c +++ b/drivers/infiniband/hw/qib/qib_fs.c @@ -61,8 +61,8 @@ static int qibfs_mknod(struct inode *dir, struct dentry *dentry, inode->i_ino = get_next_ino(); inode->i_mode = mode; - inode->i_uid = 0; - inode->i_gid = 0; + inode->i_uid = GLOBAL_ROOT_UID; + inode->i_gid = GLOBAL_ROOT_GID; inode->i_blocks = 0; inode->i_atime = CURRENT_TIME; inode->i_mtime = inode->i_atime; diff --git a/init/Kconfig b/init/Kconfig index 355b1af6932e..f0371a65ac06 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -960,7 +960,6 @@ config UIDGID_CONVERTED depends on !UML || HOSTFS = n # The rare drivers that won't build - depends on INFINIBAND_QIB = n depends on BLK_DEV_LOOP = n depends on ANDROID_BINDER_IPC = n |