From d298ef5c7047fd3c2b12e7470e844a521efbbf28 Mon Sep 17 00:00:00 2001
From: Jan Schmidt <list.btrfs@jan-o-sch.net>
Date: Thu, 1 Dec 2011 14:35:19 +0100
Subject: [PATCH] --- yaml --- r: 285999 b: refs/heads/master c:
 6bf7e080d5bcb0d399ee38ce3dabbfad64448192 h: refs/heads/master i:   285997:
 c94b61bea8f58aea7f0641bb3818bb3b2db7164d   285995:
 e450a9273239e1ed11fdb16f58e11494765293f2   285991:
 d5797561f8faf9c6c4b51bef566d7f85228009c8   285983:
 3e855757f03662d99fa62bd978560dee34b51670 v: v3

---
 [refs]                 | 2 +-
 trunk/fs/btrfs/inode.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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);