From 246440f0d475bc5f1300280122dc270a536a70e0 Mon Sep 17 00:00:00 2001
From: Arne Jansen <sensille@gmx.net>
Date: Tue, 13 Sep 2011 11:40:09 +0200
Subject: [PATCH] --- yaml --- r: 318873 b: refs/heads/master c:
 d13603ef6e14a12cd65a6975e8117c0fea7c7ddf h: refs/heads/master i:   318871:
 26f5d55b70517ffdb7bc027130c32fbde3dcfd67 v: v3

---
 [refs]                       | 2 +-
 trunk/fs/btrfs/transaction.c | 6 ++++++
 trunk/fs/btrfs/transaction.h | 6 ++++++
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 5041fb106d23..1b4d422506ec 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2f38b3e1900634e64a186873b3388b1bf85dabc0
+refs/heads/master: d13603ef6e14a12cd65a6975e8117c0fea7c7ddf
diff --git a/trunk/fs/btrfs/transaction.c b/trunk/fs/btrfs/transaction.c
index 621c8dc48fb6..23cbda0685b8 100644
--- a/trunk/fs/btrfs/transaction.c
+++ b/trunk/fs/btrfs/transaction.c
@@ -345,6 +345,7 @@ static struct btrfs_trans_handle *start_transaction(struct btrfs_root *root,
 	h->transaction = cur_trans;
 	h->blocks_used = 0;
 	h->bytes_reserved = 0;
+	h->root = root;
 	h->delayed_ref_updates = 0;
 	h->use_count = 1;
 	h->block_rsv = NULL;
@@ -511,6 +512,11 @@ 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);
 	while (count < 2) {
 		unsigned long cur = trans->delayed_ref_updates;
 		trans->delayed_ref_updates = 0;
diff --git a/trunk/fs/btrfs/transaction.h b/trunk/fs/btrfs/transaction.h
index fe27379e368b..010729446e13 100644
--- a/trunk/fs/btrfs/transaction.h
+++ b/trunk/fs/btrfs/transaction.h
@@ -57,6 +57,12 @@ struct btrfs_trans_handle {
 	struct btrfs_block_rsv *block_rsv;
 	struct btrfs_block_rsv *orig_rsv;
 	int aborted;
+	/*
+	 * this root is only needed to validate that the root passed to
+	 * start_transaction is the same as the one passed to end_transaction.
+	 * Subvolume quota depends on this
+	 */
+	struct btrfs_root *root;
 };
 
 struct btrfs_pending_snapshot {