Commit 871383be authored by David Sterba's avatar David Sterba
Browse files

btrfs: add missing unlocks to transaction abort paths 



Added in commit 49b25e05
("btrfs: enhance transaction abort infrastructure")

Reported-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.cz>
parent 8d082fb7

fs/btrfs/transaction.c

+5 −1
Original line number Diff line number Diff line
@@ -73,8 +73,10 @@ static noinline int join_transaction(struct btrfs_root *root, int nofail) 


	cur_trans = root->fs_info->running_transaction;

	if (cur_trans) {

		if (cur_trans->aborted)

		if (cur_trans->aborted) {

			spin_unlock(&root->fs_info->trans_lock);

			return cur_trans->aborted;

		}

		atomic_inc(&cur_trans->use_count);

		atomic_inc(&cur_trans->num_writers);

		cur_trans->num_joined++;
@@ -1400,6 +1402,7 @@ int btrfs_commit_transaction(struct btrfs_trans_handle *trans, 
	ret = commit_fs_roots(trans, root);

	if (ret) {

		mutex_unlock(&root->fs_info->tree_log_mutex);

		mutex_unlock(&root->fs_info->reloc_mutex);

		goto cleanup_transaction;

	}
@@ -1411,6 +1414,7 @@ int btrfs_commit_transaction(struct btrfs_trans_handle *trans, 
	ret = commit_cowonly_roots(trans, root);

	if (ret) {

		mutex_unlock(&root->fs_info->tree_log_mutex);

		mutex_unlock(&root->fs_info->reloc_mutex);

		goto cleanup_transaction;

	}