tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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>

authored by

Filipe Manana and committed by
David Sterba e1194226 7801f3ea

-2
-2
fs/btrfs/transaction.c
··· 2657 2657 btrfs_trans_release_chunk_metadata(trans); 2658 2658 trans->block_rsv = NULL; 2659 2659 btrfs_warn(fs_info, "Skipping commit of aborted transaction."); 2660 - if (current->journal_info == trans) 2661 - current->journal_info = NULL; 2662 2660 cleanup_transaction(trans, ret); 2663 2661 2664 2662 return ret;