From db6aff2554bf2be9914ca1e92e2b48491a78752c Mon Sep 17 00:00:00 2001 From: Miao Xie Date: Wed, 20 Feb 2013 14:16:39 +0000 Subject: [PATCH] --- yaml --- r: 360463 b: refs/heads/master c: 272d26d0ad8c0e326689f2fa3cdc6a5fcc8e74e0 h: refs/heads/master i: 360461: 8ca6a4dbbf33d398b3afa736379fd3cd56347e4a 360459: 899cf573158a28da137d7f89d1df4dc6fab49cec 360455: 36ef0e92007714d34e38ba5bffe400298834c4dc 360447: 3a4bf497e7a843cc50db413d30171c18d46750c0 v: v3 --- [refs] | 2 +- trunk/fs/btrfs/transaction.c | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index a213a507451f..f1f63c923075 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 683cebda90787730d5260eac0da7c2bff9fb40ef +refs/heads/master: 272d26d0ad8c0e326689f2fa3cdc6a5fcc8e74e0 diff --git a/trunk/fs/btrfs/transaction.c b/trunk/fs/btrfs/transaction.c index c1ce664c0c39..955204ca0447 100644 --- a/trunk/fs/btrfs/transaction.c +++ b/trunk/fs/btrfs/transaction.c @@ -1553,6 +1553,10 @@ int btrfs_commit_transaction(struct btrfs_trans_handle *trans, btrfs_trans_release_metadata(trans, root); trans->block_rsv = NULL; + if (trans->qgroup_reserved) { + btrfs_qgroup_free(root, trans->qgroup_reserved); + trans->qgroup_reserved = 0; + } cur_trans = trans->transaction; @@ -1833,6 +1837,10 @@ int btrfs_commit_transaction(struct btrfs_trans_handle *trans, cleanup_transaction: btrfs_trans_release_metadata(trans, root); trans->block_rsv = NULL; + if (trans->qgroup_reserved) { + btrfs_qgroup_free(root, trans->qgroup_reserved); + trans->qgroup_reserved = 0; + } btrfs_printk(root->fs_info, "Skipping commit of aborted transaction.\n"); // WARN_ON(1); if (current->journal_info == trans)