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

Commit 7973c0c1 authored by Aneesh Kumar K.V's avatar Aneesh Kumar K.V Committed by Theodore Ts'o
Browse files

ext4: Rename i_file_acl to i_file_acl_lo 



Rename i_file_acl to i_file_acl_lo. This helps
in finding bugs where we use i_file_acl instead
of the combined i_file_acl_lo and i_file_acl_high

Signed-off-by: default avatarAneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
parent 1d03ec98

fs/ext4/inode.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -2718,7 +2718,7 @@ void ext4_read_inode(struct inode * inode) 
	}

	}

	inode->i_blocks = le32_to_cpu(raw_inode->i_blocks);

	inode->i_blocks = le32_to_cpu(raw_inode->i_blocks);

	ei->i_flags = le32_to_cpu(raw_inode->i_flags);

	ei->i_flags = le32_to_cpu(raw_inode->i_flags);

	ei->i_file_acl = le32_to_cpu(raw_inode->i_file_acl);

	ei->i_file_acl = le32_to_cpu(raw_inode->i_file_acl_lo);

	if (EXT4_SB(inode->i_sb)->s_es->s_creator_os !=

	if (EXT4_SB(inode->i_sb)->s_es->s_creator_os !=

	    cpu_to_le32(EXT4_OS_HURD))

	    cpu_to_le32(EXT4_OS_HURD))

		ei->i_file_acl |=

		ei->i_file_acl |=
@@ -2866,7 +2866,7 @@ static int ext4_do_update_inode(handle_t *handle, 
	    cpu_to_le32(EXT4_OS_HURD))

	    cpu_to_le32(EXT4_OS_HURD))

		raw_inode->i_file_acl_high =

		raw_inode->i_file_acl_high =

			cpu_to_le16(ei->i_file_acl >> 32);

			cpu_to_le16(ei->i_file_acl >> 32);

	raw_inode->i_file_acl = cpu_to_le32(ei->i_file_acl);

	raw_inode->i_file_acl_lo = cpu_to_le32(ei->i_file_acl);

	if (!S_ISREG(inode->i_mode)) {

	if (!S_ISREG(inode->i_mode)) {

		raw_inode->i_dir_acl = cpu_to_le32(ei->i_dir_acl);

		raw_inode->i_dir_acl = cpu_to_le32(ei->i_dir_acl);

	} else {

	} else {

include/linux/ext4_fs.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -297,7 +297,7 @@ struct ext4_inode { 
	} osd1;				/* OS dependent 1 */

	} osd1;				/* OS dependent 1 */

	__le32	i_block[EXT4_N_BLOCKS];/* Pointers to blocks */

	__le32	i_block[EXT4_N_BLOCKS];/* Pointers to blocks */

	__le32	i_generation;	/* File version (for NFS) */

	__le32	i_generation;	/* File version (for NFS) */

	__le32	i_file_acl;	/* File ACL */

	__le32	i_file_acl_lo;	/* File ACL */

	__le32	i_dir_acl;	/* Directory ACL */

	__le32	i_dir_acl;	/* Directory ACL */

	__le32	i_obso_faddr;	/* Obsoleted fragment address */

	__le32	i_obso_faddr;	/* Obsoleted fragment address */

	union {

	union {