tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

ocfs2: Convert uid and gids between in core and on disk inodes

Cc: Mark Fasheh <mfasheh@suse.com>
Cc: Joel Becker <jlbec@evilplan.org>
Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>

Eric W. Biederman 2c034176 03ab30f7

+8 -8
+6 -6
fs/ocfs2/inode.c
··· 269 269 inode->i_generation = le32_to_cpu(fe->i_generation); 270 270 inode->i_rdev = huge_decode_dev(le64_to_cpu(fe->id1.dev1.i_rdev)); 271 271 inode->i_mode = le16_to_cpu(fe->i_mode); 272 - inode->i_uid = le32_to_cpu(fe->i_uid); 273 - inode->i_gid = le32_to_cpu(fe->i_gid); 272 + i_uid_write(inode, le32_to_cpu(fe->i_uid)); 273 + i_gid_write(inode, le32_to_cpu(fe->i_gid)); 274 274 275 275 /* Fast symlinks will have i_size but no allocated clusters. */ 276 276 if (S_ISLNK(inode->i_mode) && !fe->i_clusters) { ··· 1259 1259 1260 1260 fe->i_size = cpu_to_le64(i_size_read(inode)); 1261 1261 ocfs2_set_links_count(fe, inode->i_nlink); 1262 - fe->i_uid = cpu_to_le32(inode->i_uid); 1263 - fe->i_gid = cpu_to_le32(inode->i_gid); 1262 + fe->i_uid = cpu_to_le32(i_uid_read(inode)); 1263 + fe->i_gid = cpu_to_le32(i_gid_read(inode)); 1264 1264 fe->i_mode = cpu_to_le16(inode->i_mode); 1265 1265 fe->i_atime = cpu_to_le64(inode->i_atime.tv_sec); 1266 1266 fe->i_atime_nsec = cpu_to_le32(inode->i_atime.tv_nsec); ··· 1290 1290 ocfs2_set_inode_flags(inode); 1291 1291 i_size_write(inode, le64_to_cpu(fe->i_size)); 1292 1292 set_nlink(inode, ocfs2_read_links_count(fe)); 1293 - inode->i_uid = le32_to_cpu(fe->i_uid); 1294 - inode->i_gid = le32_to_cpu(fe->i_gid); 1293 + i_uid_write(inode, le32_to_cpu(fe->i_uid)); 1294 + i_gid_write(inode, le32_to_cpu(fe->i_gid)); 1295 1295 inode->i_mode = le16_to_cpu(fe->i_mode); 1296 1296 if (S_ISLNK(inode->i_mode) && le32_to_cpu(fe->i_clusters) == 0) 1297 1297 inode->i_blocks = 0;
+2 -2
fs/ocfs2/namei.c
··· 512 512 fe->i_suballoc_loc = cpu_to_le64(suballoc_loc); 513 513 fe->i_suballoc_bit = cpu_to_le16(suballoc_bit); 514 514 fe->i_suballoc_slot = cpu_to_le16(inode_ac->ac_alloc_slot); 515 - fe->i_uid = cpu_to_le32(inode->i_uid); 516 - fe->i_gid = cpu_to_le32(inode->i_gid); 515 + fe->i_uid = cpu_to_le32(i_uid_read(inode)); 516 + fe->i_gid = cpu_to_le32(i_gid_read(inode)); 517 517 fe->i_mode = cpu_to_le16(inode->i_mode); 518 518 if (S_ISCHR(inode->i_mode) || S_ISBLK(inode->i_mode)) 519 519 fe->id1.dev1.i_rdev = cpu_to_le64(huge_encode_dev(dev));