From 3f338722d3318e12c5b49d7277e0cf3b7bc81d85 Mon Sep 17 00:00:00 2001 From: Liu Bo Date: Mon, 4 Mar 2013 16:25:41 +0000 Subject: [PATCH] --- yaml --- r: 361006 b: refs/heads/master c: 66b6135b7cf741f6f44ba938b27583ea3b83bd12 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/btrfs/transaction.c | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 3fdb960acfa1..ba349d626541 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0f788c58194e4ccc5b3ab23f872c5e18542335e4 +refs/heads/master: 66b6135b7cf741f6f44ba938b27583ea3b83bd12 diff --git a/trunk/fs/btrfs/transaction.c b/trunk/fs/btrfs/transaction.c index d8fce6fe9cf8..fedede1fe178 100644 --- a/trunk/fs/btrfs/transaction.c +++ b/trunk/fs/btrfs/transaction.c @@ -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;