From b713f647912c12be11d881f46b2ea47b149cd17a Mon Sep 17 00:00:00 2001
From: Miao Xie <miaox@cn.fujitsu.com>
Date: Thu, 6 Sep 2012 04:03:56 -0600
Subject: [PATCH] --- yaml --- r: 332543 b: refs/heads/master c:
 48c03c4bcfd7a1fcb1e05e9b1db1188cdbecf49a h: refs/heads/master i:   332541:
 3d760be97e8445d6ea3e786a8121f3cf5604c6e7   332539:
 66eee99bd80555f12457aba02971a24052c98a60   332535:
 577fe5d3672d6bb037684be947f1c801be168677   332527:
 e63a77be845dd21a9c9bd53d949881cd0a94efe6   332511:
 759da7c3e72f0df5c77355262a32ccba8ab66df8   332479:
 6db4cd8eff2e3e079812c7d873aa56f328df9c4b   332415:
 b8a675aa1d30f2a6df6e3297bfa2e7d87ac2271b   332287:
 165ffa976806b69c7e25392089c90c2759726eb3 v: v3

---
 [refs]                       | 2 +-
 trunk/fs/btrfs/extent-tree.c | 6 +++---
 trunk/fs/btrfs/ioctl.c       | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index b45656937049..4a38aadbc565 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 42874b3db7817f662b1d7c6e32f8b63638fa0321
+refs/heads/master: 48c03c4bcfd7a1fcb1e05e9b1db1188cdbecf49a
diff --git a/trunk/fs/btrfs/extent-tree.c b/trunk/fs/btrfs/extent-tree.c
index 36e03312267a..b6b33e463ac3 100644
--- a/trunk/fs/btrfs/extent-tree.c
+++ b/trunk/fs/btrfs/extent-tree.c
@@ -4414,10 +4414,10 @@ int btrfs_snap_reserve_metadata(struct btrfs_trans_handle *trans,
 	struct btrfs_block_rsv *src_rsv = get_block_rsv(trans, root);
 	struct btrfs_block_rsv *dst_rsv = &pending->block_rsv;
 	/*
-	 * two for root back/forward refs, two for directory entries
-	 * and one for root of the snapshot.
+	 * two for root back/forward refs, two for directory entries,
+	 * one for root of the snapshot and one for parent inode.
 	 */
-	u64 num_bytes = btrfs_calc_trans_metadata_size(root, 5);
+	u64 num_bytes = btrfs_calc_trans_metadata_size(root, 6);
 	dst_rsv->space_info = src_rsv->space_info;
 	return block_rsv_migrate_bytes(src_rsv, dst_rsv, num_bytes);
 }
diff --git a/trunk/fs/btrfs/ioctl.c b/trunk/fs/btrfs/ioctl.c
index e6934de55a8b..c56daa368768 100644
--- a/trunk/fs/btrfs/ioctl.c
+++ b/trunk/fs/btrfs/ioctl.c
@@ -526,7 +526,7 @@ static int create_snapshot(struct btrfs_root *root, struct dentry *dentry,
 		*inherit = NULL;	/* take responsibility to free it */
 	}
 
-	trans = btrfs_start_transaction(root->fs_info->extent_root, 5);
+	trans = btrfs_start_transaction(root->fs_info->extent_root, 6);
 	if (IS_ERR(trans)) {
 		ret = PTR_ERR(trans);
 		goto fail;