---

yaml --- r: 361357 b: refs/heads/master c: 7c2ec3f h: refs/heads/master i: 361355: 3ce7436 v: v3
git-mirror · Mar 14, 2013 · c7bb6ca · c7bb6ca
1 parent 68dd025
commit c7bb6ca
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 720f1e2060138855b4a1b1e8aa642f9c7feb6750
+refs/heads/master: 7c2ec3f0730729f4829d01f7c19538d135f86712
diff --git a/trunk/fs/btrfs/transaction.c b/trunk/fs/btrfs/transaction.c
@@ -626,14 +626,13 @@ static int __btrfs_end_transaction(struct btrfs_trans_handle *trans,
 
 	btrfs_trans_release_metadata(trans, root);
 	trans->block_rsv = NULL;
-	/*
-	 * the same root has to be passed to start_transaction and
-	 * end_transaction. Subvolume quota depends on this.
-	 */
-	WARN_ON(trans->root != root);
 
 	if (trans->qgroup_reserved) {
-		btrfs_qgroup_free(root, trans->qgroup_reserved);
+		/*
+		 * the same root has to be passed here between start_transaction
+		 * and end_transaction. Subvolume quota depends on this.
+		 */
+		btrfs_qgroup_free(trans->root, trans->qgroup_reserved);
 		trans->qgroup_reserved = 0;
 	}