diff options
| author | Mark Brown <[email protected]> | 2024-10-07 13:01:00 +0000 |
|---|---|---|
| committer | Mark Brown <[email protected]> | 2024-10-07 13:01:00 +0000 |
| commit | 85eadae61931f6268b49b5722039e5a248b9ee4c (patch) | |
| tree | 3ee81f25a394ce2a2ec706f0aff07515b78d4b01 /fs/ext4/xattr.c | |
| parent | Add of_regulator_get_optional() and Fix MTK Power (diff) | |
| parent | Linux 6.12-rc2 (diff) | |
| download | kernel-85eadae61931f6268b49b5722039e5a248b9ee4c.tar.gz kernel-85eadae61931f6268b49b5722039e5a248b9ee4c.zip | |
regulator: Merge up v6.12-rc2
Pulls in a build fix for the KVM selftests.
Diffstat (limited to 'fs/ext4/xattr.c')
| -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; } |