mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-24 19:35:58 +00:00
btrfs: add missing setup of log for full commit at add_conflicting_inode()
commit94cd63ae67
upstream. When logging conflicting inodes, if we reach the maximum limit of inodes, we return BTRFS_LOG_FORCE_COMMIT to force a transaction commit. However we don't mark the log for full commit (with btrfs_set_log_full_commit()), which means that once we leave the log transaction and before we commit the transaction, some other task may sync the log, which is incomplete as we have not logged all conflicting inodes, leading to some inconsistent in case that log ends up being replayed. So also call btrfs_set_log_full_commit() at add_conflicting_inode(). Fixes:e09d94c9e4
("btrfs: log conflicting inodes without holding log mutex of the initial inode") CC: stable@vger.kernel.org # 6.1 Reviewed-by: Josef Bacik <josef@toxicpanda.com> Signed-off-by: Filipe Manana <fdmanana@suse.com> Signed-off-by: David Sterba <dsterba@suse.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
f4c0df59e0
commit
076fb040d4
1 changed files with 3 additions and 1 deletions
|
@ -5626,8 +5626,10 @@ static int add_conflicting_inode(struct btrfs_trans_handle *trans,
|
|||
* LOG_INODE_EXISTS mode) and slow down other fsyncs or transaction
|
||||
* commits.
|
||||
*/
|
||||
if (ctx->num_conflict_inodes >= MAX_CONFLICT_INODES)
|
||||
if (ctx->num_conflict_inodes >= MAX_CONFLICT_INODES) {
|
||||
btrfs_set_log_full_commit(trans);
|
||||
return BTRFS_LOG_FORCE_COMMIT;
|
||||
}
|
||||
|
||||
inode = btrfs_iget(root->fs_info->sb, ino, root);
|
||||
/*
|
||||
|
|
Loading…
Reference in a new issue