oracleasm: Compat changes for 3.5

The inode's i_uid field was converted to a kuid_t type to support user
namespaces in kernel commit 92361636e. Change initializer type.

Signed-off-by: Dwight Engen <dwight.engen@oracle.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/block/oracleasm/driver.c b/drivers/block/oracleasm/driver.c
index 2522ba6404fba858ea5835e7c344209ae15a4c5d..c4d4d3ef490d7e3dec5a70a1d6a8ef3e844c4ad4 100644 (file)
--- a/drivers/block/oracleasm/driver.c
+++ b/drivers/block/oracleasm/driver.c
@@ -2728,7 +2728,8 @@ static int asmfs_fill_super(struct super_block *sb,
 
        inode->i_ino = (unsigned long)inode;
        inode->i_mode = S_IFDIR | 0755;
-       inode->i_uid = inode->i_gid = 0;
+       inode->i_uid = GLOBAL_ROOT_UID;
+       inode->i_gid = GLOBAL_ROOT_GID;
        set_i_blksize(inode, PAGE_CACHE_SIZE);
        inode->i_blocks = 0;
        inode->i_rdev = 0;
@@ -2758,7 +2759,8 @@ static int asmfs_fill_super(struct super_block *sb,
                goto out_genocide;
        inode->i_ino = (unsigned long)inode;
        inode->i_mode = S_IFDIR | 0755;
-       inode->i_uid = inode->i_gid = 0;
+       inode->i_uid = GLOBAL_ROOT_UID;
+       inode->i_gid = GLOBAL_ROOT_GID;
        inode->i_atime = inode->i_mtime = inode->i_ctime = CURRENT_TIME;
        inode->i_op = &asmfs_disk_dir_inode_operations;
        inode->i_fop = &asmfs_dir_operations;
@@ -2777,7 +2779,8 @@ static int asmfs_fill_super(struct super_block *sb,
                goto out_genocide;
        inode->i_ino = (unsigned long)inode;
        inode->i_mode = S_IFDIR | 0770;
-       inode->i_uid = inode->i_gid = 0;
+       inode->i_uid = GLOBAL_ROOT_UID;
+       inode->i_gid = GLOBAL_ROOT_GID;
        inode->i_atime = inode->i_mtime = inode->i_ctime = CURRENT_TIME;
        inode->i_op = &asmfs_iid_dir_inode_operations;
        inode->i_fop = &asmfs_dir_operations;