Commit 69f3a303 authored by Ye Bin's avatar Ye Bin Committed by Theodore Ts'o
Browse files

ext4: introduce ITAIL helper 



Introduce ITAIL helper to get the bound of xattr in inode.

Signed-off-by: default avatarYe Bin <yebin10@huawei.com>
Reviewed-by: default avatarJan Kara <jack@suse.cz>
Link: https://patch.msgid.link/20250208063141.1539283-2-yebin@huaweicloud.com


Signed-off-by: default avatarTheodore Ts'o <tytso@mit.edu>
parent f6fc1584

fs/ext4/xattr.c

+5 −5
Original line number Diff line number Diff line
@@ -649,7 +649,7 @@ ext4_xattr_ibody_get(struct inode *inode, int name_index, const char *name, 
		return error;

	raw_inode = ext4_raw_inode(&iloc);

	header = IHDR(inode, raw_inode);

	end = (void *)raw_inode + EXT4_SB(inode->i_sb)->s_inode_size;

	end = ITAIL(inode, raw_inode);

	error = xattr_check_inode(inode, header, end);

	if (error)

		goto cleanup;
@@ -793,7 +793,7 @@ ext4_xattr_ibody_list(struct dentry *dentry, char *buffer, size_t buffer_size) 
		return error;

	raw_inode = ext4_raw_inode(&iloc);

	header = IHDR(inode, raw_inode);

	end = (void *)raw_inode + EXT4_SB(inode->i_sb)->s_inode_size;

	end = ITAIL(inode, raw_inode);

	error = xattr_check_inode(inode, header, end);

	if (error)

		goto cleanup;
@@ -879,7 +879,7 @@ int ext4_get_inode_usage(struct inode *inode, qsize_t *usage) 
			goto out;

		raw_inode = ext4_raw_inode(&iloc);

		header = IHDR(inode, raw_inode);

		end = (void *)raw_inode + EXT4_SB(inode->i_sb)->s_inode_size;

		end = ITAIL(inode, raw_inode);

		ret = xattr_check_inode(inode, header, end);

		if (ret)

			goto out;
@@ -2244,7 +2244,7 @@ int ext4_xattr_ibody_find(struct inode *inode, struct ext4_xattr_info *i, 
	header = IHDR(inode, raw_inode);

	is->s.base = is->s.first = IFIRST(header);

	is->s.here = is->s.first;

	is->s.end = (void *)raw_inode + EXT4_SB(inode->i_sb)->s_inode_size;

	is->s.end = ITAIL(inode, raw_inode);

	if (ext4_test_inode_state(inode, EXT4_STATE_XATTR)) {

		error = xattr_check_inode(inode, header, is->s.end);

		if (error)
@@ -2795,7 +2795,7 @@ int ext4_expand_extra_isize_ea(struct inode *inode, int new_extra_isize, 
	 */



	base = IFIRST(header);

	end = (void *)raw_inode + EXT4_SB(inode->i_sb)->s_inode_size;

	end = ITAIL(inode, raw_inode);

	min_offs = end - base;

	total_ino = sizeof(struct ext4_xattr_ibody_header) + sizeof(u32);

fs/ext4/xattr.h

+3 −0
Original line number Diff line number Diff line
@@ -67,6 +67,9 @@ struct ext4_xattr_entry { 
		((void *)raw_inode + \

		EXT4_GOOD_OLD_INODE_SIZE + \

		EXT4_I(inode)->i_extra_isize))

#define ITAIL(inode, raw_inode) \

	((void *)(raw_inode) + \

	 EXT4_SB((inode)->i_sb)->s_inode_size)

#define IFIRST(hdr) ((struct ext4_xattr_entry *)((hdr)+1))



/*