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

Commit 1a0a994e authored by Eric W. Biederman's avatar Eric W. Biederman
Browse files

userns: Convert logfs to use kuid/kgid where appropriate 



Cc: Joern Engel <joern@logfs.org>
Cc: Prasad Joshi <prasadjoshi.linux@gmail.com>
Acked-by: default avatarSerge Hallyn <serge.hallyn@canonical.com>
Signed-off-by: default avatarEric W. Biederman <ebiederm@xmission.com>
parent ba64e2b9

fs/logfs/inode.c

+2 −2
Original line number Diff line number Diff line
@@ -192,8 +192,8 @@ static void logfs_init_inode(struct super_block *sb, struct inode *inode) 
	li->li_height	= 0;

	li->li_used_bytes = 0;

	li->li_block	= NULL;

	inode->i_uid	= 0;

	inode->i_gid	= 0;

	i_uid_write(inode, 0);

	i_gid_write(inode, 0);

	inode->i_size	= 0;

	inode->i_blocks	= 0;

	inode->i_ctime	= CURRENT_TIME;

fs/logfs/readwrite.c

+4 −4
Original line number Diff line number Diff line
@@ -119,8 +119,8 @@ static void logfs_disk_to_inode(struct logfs_disk_inode *di, struct inode*inode) 
	inode->i_mode	= be16_to_cpu(di->di_mode);

	li->li_height	= di->di_height;

	li->li_flags	= be32_to_cpu(di->di_flags);

	inode->i_uid	= be32_to_cpu(di->di_uid);

	inode->i_gid	= be32_to_cpu(di->di_gid);

	i_uid_write(inode, be32_to_cpu(di->di_uid));

	i_gid_write(inode, be32_to_cpu(di->di_gid));

	inode->i_size	= be64_to_cpu(di->di_size);

	logfs_set_blocks(inode, be64_to_cpu(di->di_used_bytes));

	inode->i_atime	= be64_to_timespec(di->di_atime);
@@ -156,8 +156,8 @@ static void logfs_inode_to_disk(struct inode *inode, struct logfs_disk_inode*di) 
	di->di_height	= li->li_height;

	di->di_pad	= 0;

	di->di_flags	= cpu_to_be32(li->li_flags);

	di->di_uid	= cpu_to_be32(inode->i_uid);

	di->di_gid	= cpu_to_be32(inode->i_gid);

	di->di_uid	= cpu_to_be32(i_uid_read(inode));

	di->di_gid	= cpu_to_be32(i_gid_read(inode));

	di->di_size	= cpu_to_be64(i_size_read(inode));

	di->di_used_bytes = cpu_to_be64(li->li_used_bytes);

	di->di_atime	= timespec_to_be64(inode->i_atime);

init/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -946,7 +946,6 @@ config UIDGID_CONVERTED 
	depends on HPFS_FS = n

	depends on JFFS2_FS = n

	depends on JFS_FS = n

	depends on LOGFS = n

	depends on MINIX_FS = n

	depends on NCP_FS = n

	depends on NFSD = n