Skip to content

Commit e119422

Browse files
fdmananakdave
authored andcommitted
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>
1 parent 7801f3e commit e119422

1 file changed

Lines changed: 0 additions & 2 deletions

File tree

fs/btrfs/transaction.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2657,8 +2657,6 @@ int btrfs_commit_transaction(struct btrfs_trans_handle *trans)
26572657
btrfs_trans_release_chunk_metadata(trans);
26582658
trans->block_rsv = NULL;
26592659
btrfs_warn(fs_info, "Skipping commit of aborted transaction.");
2660-
if (current->journal_info == trans)
2661-
current->journal_info = NULL;
26622660
cleanup_transaction(trans, ret);
26632661

26642662
return ret;

0 commit comments

Comments
 (0)