diff --git a/[refs] b/[refs]
index d94d9f8d4927..6fc2b5618f1c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 76a05b35a320e8c968d0fec8f512a1acae227309
+refs/heads/master: cc7b0c9b701a079016183f3546b4d720194b367f
diff --git a/trunk/fs/btrfs/disk-io.c b/trunk/fs/btrfs/disk-io.c
index 0ff16d3331da..4b0ea0b80c23 100644
--- a/trunk/fs/btrfs/disk-io.c
+++ b/trunk/fs/btrfs/disk-io.c
@@ -848,8 +848,6 @@ struct extent_buffer *read_tree_block(struct btrfs_root *root, u64 bytenr,
 
 	if (ret == 0)
 		set_bit(EXTENT_BUFFER_UPTODATE, &buf->bflags);
-	else
-		WARN_ON(1);
 	return buf;
 
 }
diff --git a/trunk/fs/btrfs/inode.c b/trunk/fs/btrfs/inode.c
index 22450bd972df..1c8b0190d031 100644
--- a/trunk/fs/btrfs/inode.c
+++ b/trunk/fs/btrfs/inode.c
@@ -4296,7 +4296,6 @@ struct extent_map *btrfs_get_extent(struct inode *inode, struct page *page,
 	}
 	if (err) {
 		free_extent_map(em);
-		WARN_ON(1);
 		return ERR_PTR(err);
 	}
 	return em;