diff options
author | Luis Henriques (SUSE) <luis.henriques@linux.dev> | 2024-09-23 11:49:09 +0100 |
---|---|---|
committer | Theodore Ts'o <tytso@mit.edu> | 2024-10-04 17:36:09 -0400 |
commit | 04e6ce8f06d161399e5afde3df5dcfa9455b4952 (patch) | |
tree | 2405796fda222ce24bec452f8a8dc5941b508803 | |
parent | faab35a0370fd6e0821c7a8dd213492946fc776f (diff) | |
download | lwn-04e6ce8f06d161399e5afde3df5dcfa9455b4952.tar.gz lwn-04e6ce8f06d161399e5afde3df5dcfa9455b4952.zip |
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: Jan Kara <jack@suse.cz>
Signed-off-by: Luis Henriques (SUSE) <luis.henriques@linux.dev>
Reviewed-by: Jan Kara <jack@suse.cz>
Link: https://patch.msgid.link/20240923104909.18342-3-luis.henriques@linux.dev
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Cc: stable@kernel.org
-rw-r--r-- | fs/ext4/xattr.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/ext4/xattr.c b/fs/ext4/xattr.c index e0e1956dcdd3..7647e9f6e190 100644 --- a/fs/ext4/xattr.c +++ b/fs/ext4/xattr.c @@ -2559,6 +2559,8 @@ retry: 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 @@ retry: if (error == 0) error = error2; } - ext4_fc_mark_ineligible(inode->i_sb, EXT4_FC_REASON_XATTR, NULL); return error; } |