Commit b36093c6 authored Mar 07, 2023 by Ye Bin Committed by Greg Kroah-Hartman Mar 17, 2023

ext4: move where set the MAY_INLINE_DATA flag is set



commit 1dcdce5919115a471bf4921a57f20050c545a236 upstream.

The only caller of ext4_find_inline_data_nolock() that needs setting of
EXT4_STATE_MAY_INLINE_DATA flag is ext4_iget_extra_inode().  In
ext4_write_inline_data_end() we just need to update inode->i_inline_off.
Since we are going to add one more caller that does not need to set
EXT4_STATE_MAY_INLINE_DATA, just move setting of EXT4_STATE_MAY_INLINE_DATA
out to ext4_iget_extra_inode().

Signed-off-by: Ye Bin <yebin10@huawei.com>
Cc: stable@kernel.org
Reviewed-by: Jan Kara <jack@suse.cz>
Link: https://lore.kernel.org/r/20230307015253.2232062-2-yebin@huaweicloud.com


Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent c24f8384

fs/ext4/inline.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -157,7 +157,6 @@ int ext4_find_inline_data_nolock(struct inode *inode)
		(void *)ext4_raw_inode(&is.iloc));
		EXT4_I(inode)->i_inline_size = EXT4_MIN_INLINE_DATA_SIZE +
		le32_to_cpu(is.s.here->e_value_size);
		ext4_set_inode_state(inode, EXT4_STATE_MAY_INLINE_DATA);
		}
		out:
		brelse(is.iloc.bh);

fs/ext4/inode.c

+6 −1

Original line number	Diff line number	Diff line
		@@ -4862,8 +4862,13 @@ static inline int ext4_iget_extra_inode(struct inode *inode,

		if (EXT4_INODE_HAS_XATTR_SPACE(inode) &&
		*magic == cpu_to_le32(EXT4_XATTR_MAGIC)) {
		int err;

		ext4_set_inode_state(inode, EXT4_STATE_XATTR);
		return ext4_find_inline_data_nolock(inode);
		err = ext4_find_inline_data_nolock(inode);
		if (!err && ext4_has_inline_data(inode))
		ext4_set_inode_state(inode, EXT4_STATE_MAY_INLINE_DATA);
		return err;
		} else
		EXT4_I(inode)->i_inline_off = 0;
		return 0;