summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFilipe Manana <fdmanana@suse.com>2026-04-01 21:46:59 +0300
committerDavid Sterba <dsterba@suse.com>2026-04-07 20:42:24 +0300
commite1194226bf7642cab9d45f32fff4ea600c9069cc (patch)
tree295dac5b83f1d706ea6c9f8a61d069b46b1e80c9
parent7801f3ea9591cf040f7f92c44f8ec91eaa0d6207 (diff)
downloadlinux-e1194226bf7642cab9d45f32fff4ea600c9069cc.tar.xz
btrfs: remove duplicate journal_info reset on failure to commit transaction
If we get an error during the transaction commit path, we are resetting current->journal_info to NULL twice - once in btrfs_commit_transaction() right before calling cleanup_transaction() and then once again inside cleanup_transaction(). Remove the instance in btrfs_commit_transaction(). Reviewed-by: Anand Jain <asj@kernel.org> Signed-off-by: Filipe Manana <fdmanana@suse.com> Signed-off-by: David Sterba <dsterba@suse.com>
-rw-r--r--fs/btrfs/transaction.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/fs/btrfs/transaction.c b/fs/btrfs/transaction.c
index c9c316ce4bdc..248adb785051 100644
--- a/fs/btrfs/transaction.c
+++ b/fs/btrfs/transaction.c
@@ -2657,8 +2657,6 @@ cleanup_transaction:
btrfs_trans_release_chunk_metadata(trans);
trans->block_rsv = NULL;
btrfs_warn(fs_info, "Skipping commit of aborted transaction.");
- if (current->journal_info == trans)
- current->journal_info = NULL;
cleanup_transaction(trans, ret);
return ret;