diff --git a/[refs] b/[refs]
index 7f884841ae8e..1c1bdaa9d4d5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7c4452b9a6ca7aabe37ea2e43d443110bdc08cd8
+refs/heads/master: 308535a05e4c39d2be26e0aeee722682deeb6f77
diff --git a/trunk/fs/btrfs/extent-tree.c b/trunk/fs/btrfs/extent-tree.c
index 652cf305a967..62051a36664a 100644
--- a/trunk/fs/btrfs/extent-tree.c
+++ b/trunk/fs/btrfs/extent-tree.c
@@ -541,7 +541,7 @@ static int find_free_extent(struct btrfs_trans_handle *trans, struct btrfs_root
 	if (num_blocks == 0) {
 		fill_prealloc = 1;
 		num_blocks = 1;
-		total_needed = min(level + 2, BTRFS_MAX_LEVEL) * 3;
+		total_needed = (min(level + 1, BTRFS_MAX_LEVEL) + 2) * 3;
 	}
 	find_search_start(root, 0);
 	if (info->block_group_cache &&