Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 66b6135b authored by Liu Bo's avatar Liu Bo Committed by Josef Bacik
Browse files

Btrfs: avoid deadlock on transaction waiting list 



Only let one trans handle to wait for other handles, otherwise we
will get ABBA issues.

Signed-off-by: default avatarLiu Bo <bo.li.liu@oracle.com>
Signed-off-by: default avatarJosef Bacik <jbacik@fusionio.com>
parent 0f788c58

fs/btrfs/transaction.c

+7 −0
Original line number Diff line number Diff line
@@ -1457,6 +1457,13 @@ static void cleanup_transaction(struct btrfs_trans_handle *trans, 
	btrfs_abort_transaction(trans, root, err);



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



	if (list_empty(&cur_trans->list)) {

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

		btrfs_end_transaction(trans, root);

		return;

	}



	list_del_init(&cur_trans->list);

	if (cur_trans == root->fs_info->running_transaction) {

		root->fs_info->trans_no_join = 1;