D11354.id30093.diff
No OneTemporary
Actions

Size

940 B

Referenced Files

None

Subscribers

None

D11354.id30093.diff
View Options

	Index: sys/fs/ext2fs/ext2_inode_cnv.c
	===================================================================
	--- sys/fs/ext2fs/ext2_inode_cnv.c
	+++ sys/fs/ext2fs/ext2_inode_cnv.c
	@@ -124,6 +124,8 @@
	ip->i_gen = ei->e2di_gen;
	ip->i_uid = ei->e2di_uid;
	ip->i_gid = ei->e2di_gid;
	+ ip->i_uid \|= (uint32_t)ei->e2di_uid_high << 16;
	+ ip->i_gid \|= (uint32_t)ei->e2di_gid_high << 16;
	/* XXX use memcpy */
	for (i = 0; i < EXT2_NDADDR; i++)
	ip->i_db[i] = ei->e2di_blocks[i];
	@@ -170,8 +172,10 @@
	ei->e2di_facl = ip->i_facl & 0xffffffff;
	ei->e2di_facl_high = ip->i_facl >> 32 & 0xffff;
	ei->e2di_gen = ip->i_gen;
	- ei->e2di_uid = ip->i_uid;
	- ei->e2di_gid = ip->i_gid;
	+ ei->e2di_uid = ip->i_uid & 0xffff;
	+ ei->e2di_uid_high = ip->i_uid >> 16 & 0xffff;
	+ ei->e2di_gid = ip->i_gid & 0xffff;
	+ ei->e2di_gid_high = ip->i_gid >> 16 & 0xffff;
	/* XXX use memcpy */
	for (i = 0; i < EXT2_NDADDR; i++)
	ei->e2di_blocks[i] = ip->i_db[i];