From: Dwight Engen Date: Thu, 22 Aug 2013 21:19:08 +0000 (-0400) Subject: oracleasm: Compat changes for 3.5 X-Git-Tag: v4.1.12-92~323^2~14 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=c1143002fa6131d6c8f0650566aa02fad003613c;p=users%2Fjedix%2Flinux-maple.git 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 Signed-off-by: Martin K. Petersen --- diff --git a/drivers/block/oracleasm/driver.c b/drivers/block/oracleasm/driver.c index 2522ba6404fb..c4d4d3ef490d 100644 --- 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;