Skip to content

Commit

Permalink
btrfs: add missing unlocks to transaction abort paths
Browse files Browse the repository at this point in the history
Added in commit 49b25e0
("btrfs: enhance transaction abort infrastructure")

Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: David Sterba <dsterba@suse.cz>
  • Loading branch information
David Sterba committed Apr 18, 2012
1 parent 8d082fb commit 871383b
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion fs/btrfs/transaction.c
Original file line number Diff line number Diff line change
Expand Up @@ -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++;
Expand Down Expand Up @@ -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;
}

Expand All @@ -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;
}

Expand Down

0 comments on commit 871383b

Please sign in to comment.