diff --git a/[refs] b/[refs]
index 2d71950ffd47..41721dc2f6f0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ce3ed71a58094544da1e1dc4723f1f553bb5b2d5
+refs/heads/master: 1c2308f8e7d8491467e0095af2b01500f1b70819
diff --git a/trunk/fs/btrfs/extent-tree.c b/trunk/fs/btrfs/extent-tree.c
index 813566acc5d3..558fbe407368 100644
--- a/trunk/fs/btrfs/extent-tree.c
+++ b/trunk/fs/btrfs/extent-tree.c
@@ -2365,6 +2365,9 @@ int btrfs_alloc_reserved_extent(struct btrfs_trans_handle *trans,
 				struct btrfs_key *ins)
 {
 	int ret;
+
+	if (root_objectid == BTRFS_TREE_LOG_OBJECTID)
+		return 0;
 	maybe_lock_mutex(root);
 	ret = __btrfs_alloc_reserved_extent(trans, root, root_objectid,
 					    ref_generation, owner,