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>

diff --git a/drivers/infiniband/hw/qib/qib_fs.c b/drivers/infiniband/hw/qib/qib_fs.c
index cff8a6c32161a1cc7111e02671ce882e7152f505..65a2a23f6f8a8f537193ea775f2da2da4bce93d6 100644 (file)
--- 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 355b1af6932e76e794f5b7bfac0a42435681883b..f0371a65ac06c912c60716c3c0f91de69bcb2165 100644 (file)
--- 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