Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2c034176 authored by Eric W. Biederman's avatar Eric W. Biederman
Browse files

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: default avatar"Eric W. Biederman" <ebiederm@xmission.com>
parent 03ab30f7

fs/ocfs2/inode.c

+6 −6
Original line number Diff line number Diff line
@@ -269,8 +269,8 @@ void ocfs2_populate_inode(struct inode *inode, struct ocfs2_dinode *fe, 
	inode->i_generation = le32_to_cpu(fe->i_generation);

	inode->i_rdev = huge_decode_dev(le64_to_cpu(fe->id1.dev1.i_rdev));

	inode->i_mode = le16_to_cpu(fe->i_mode);

	inode->i_uid = le32_to_cpu(fe->i_uid);

	inode->i_gid = le32_to_cpu(fe->i_gid);

	i_uid_write(inode, le32_to_cpu(fe->i_uid));

	i_gid_write(inode, le32_to_cpu(fe->i_gid));



	/* Fast symlinks will have i_size but no allocated clusters. */

	if (S_ISLNK(inode->i_mode) && !fe->i_clusters) {
@@ -1259,8 +1259,8 @@ int ocfs2_mark_inode_dirty(handle_t *handle, 


	fe->i_size = cpu_to_le64(i_size_read(inode));

	ocfs2_set_links_count(fe, inode->i_nlink);

	fe->i_uid = cpu_to_le32(inode->i_uid);

	fe->i_gid = cpu_to_le32(inode->i_gid);

	fe->i_uid = cpu_to_le32(i_uid_read(inode));

	fe->i_gid = cpu_to_le32(i_gid_read(inode));

	fe->i_mode = cpu_to_le16(inode->i_mode);

	fe->i_atime = cpu_to_le64(inode->i_atime.tv_sec);

	fe->i_atime_nsec = cpu_to_le32(inode->i_atime.tv_nsec);
@@ -1290,8 +1290,8 @@ void ocfs2_refresh_inode(struct inode *inode, 
	ocfs2_set_inode_flags(inode);

	i_size_write(inode, le64_to_cpu(fe->i_size));

	set_nlink(inode, ocfs2_read_links_count(fe));

	inode->i_uid = le32_to_cpu(fe->i_uid);

	inode->i_gid = le32_to_cpu(fe->i_gid);

	i_uid_write(inode, le32_to_cpu(fe->i_uid));

	i_gid_write(inode, le32_to_cpu(fe->i_gid));

	inode->i_mode = le16_to_cpu(fe->i_mode);

	if (S_ISLNK(inode->i_mode) && le32_to_cpu(fe->i_clusters) == 0)

		inode->i_blocks = 0;

fs/ocfs2/namei.c

+2 −2
Original line number Diff line number Diff line
@@ -512,8 +512,8 @@ static int __ocfs2_mknod_locked(struct inode *dir, 
	fe->i_suballoc_loc = cpu_to_le64(suballoc_loc);

	fe->i_suballoc_bit = cpu_to_le16(suballoc_bit);

	fe->i_suballoc_slot = cpu_to_le16(inode_ac->ac_alloc_slot);

	fe->i_uid = cpu_to_le32(inode->i_uid);

	fe->i_gid = cpu_to_le32(inode->i_gid);

	fe->i_uid = cpu_to_le32(i_uid_read(inode));

	fe->i_gid = cpu_to_le32(i_gid_read(inode));

	fe->i_mode = cpu_to_le16(inode->i_mode);

	if (S_ISCHR(inode->i_mode) || S_ISBLK(inode->i_mode))

		fe->id1.dev1.i_rdev = cpu_to_le64(huge_encode_dev(dev));