2 files changed, 6 insertions, 1 deletions

diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c
index 42bf99168056..ecb74b720262 100644
--- a/fs/btrfs/disk-io.c
+++ b/fs/btrfs/disk-io.c
@@ -346,7 +346,7 @@ int btree_readpage_end_io_hook(struct page *page, u64 start, u64 end,
         eb = alloc_extent_buffer(tree, start, len, page, GFP_NOFS);
 
         found_start = btrfs_header_bytenr(eb);
-        if (found_start != start) {
+        if (0 && found_start != start) {
                 printk("bad tree block start %llu %llu\n",
                        (unsigned long long)found_start,
                        (unsigned long long)eb->start);
@@ -592,6 +592,9 @@ static int btree_releasepage(struct page *page, gfp_t gfp_flags)
         struct extent_map_tree *map;
         int ret;
 
+        if (PageWriteback(page) || PageDirty(page))
+            return 0;
+
         tree = &BTRFS_I(page->mapping->host)->io_tree;
         map = &BTRFS_I(page->mapping->host)->extent_tree;
 
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index 073fdd77c784..24b7e97fccb9 100644
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -3060,6 +3060,8 @@ static int __btrfs_releasepage(struct page *page, gfp_t gfp_flags)
 
 static int btrfs_releasepage(struct page *page, gfp_t gfp_flags)
 {
+        if (PageWriteback(page) || PageDirty(page))
+                return 0;
         return __btrfs_releasepage(page, gfp_flags);
 }