diff --git a/[refs] b/[refs]
index cceeed718463..620663b4e776 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4692cf58aa7b81f721c1653d48db99ea41421d58
+refs/heads/master: 6bf7e080d5bcb0d399ee38ce3dabbfad64448192
diff --git a/trunk/fs/btrfs/inode.c b/trunk/fs/btrfs/inode.c
index ea819386b864..603d740f0f1c 100644
--- a/trunk/fs/btrfs/inode.c
+++ b/trunk/fs/btrfs/inode.c
@@ -5022,7 +5022,7 @@ struct extent_map *btrfs_get_extent(struct inode *inode, struct page *page,
 			}
 			flush_dcache_page(page);
 		} else if (create && PageUptodate(page)) {
-			WARN_ON(1);
+			BUG();
 			if (!trans) {
 				kunmap(page);
 				free_extent_map(em);