Commit 04e6ce8f authored by Luis Henriques (SUSE)'s avatar Luis Henriques (SUSE) Committed by Theodore Ts'o
Browse files

ext4: mark fc as ineligible using an handle in ext4_xattr_set() 



Calling ext4_fc_mark_ineligible() with a NULL handle is racy and may result
in a fast-commit being done before the filesystem is effectively marked as
ineligible.  This patch moves the call to this function so that an handle
can be used.  If a transaction fails to start, then there's not point in
trying to mark the filesystem as ineligible, and an error will eventually be
returned to user-space.

Suggested-by: default avatarJan Kara <jack@suse.cz>
Signed-off-by: default avatarLuis Henriques (SUSE) <luis.henriques@linux.dev>
Reviewed-by: default avatarJan Kara <jack@suse.cz>
Link: https://patch.msgid.link/20240923104909.18342-3-luis.henriques@linux.dev


Signed-off-by: default avatarTheodore Ts'o <tytso@mit.edu>
Cc: stable@kernel.org
parent faab35a0

fs/ext4/xattr.c

+2 −1
Original line number Diff line number Diff line
@@ -2559,6 +2559,8 @@ ext4_xattr_set(struct inode *inode, int name_index, const char *name, 


		error = ext4_xattr_set_handle(handle, inode, name_index, name,

					      value, value_len, flags);

		ext4_fc_mark_ineligible(inode->i_sb, EXT4_FC_REASON_XATTR,

					handle);

		error2 = ext4_journal_stop(handle);

		if (error == -ENOSPC &&

		    ext4_should_retry_alloc(sb, &retries))
@@ -2566,7 +2568,6 @@ ext4_xattr_set(struct inode *inode, int name_index, const char *name, 
		if (error == 0)

			error = error2;

	}

	ext4_fc_mark_ineligible(inode->i_sb, EXT4_FC_REASON_XATTR, NULL);



	return error;

}