summaryrefslogtreecommitdiffstats
path: root/fs/btrfs/disk-io.c
diff options
context:
space:
mode:
authorChris Mason2008-09-11 21:51:43 +0200
committerChris Mason2008-09-25 17:04:07 +0200
commit98509cfc5a6857bddcfe4b19a9539726655ec9bd (patch)
tree187cf35f0ebd6c7ce6f17a1d0e3c6b18d0afd85a /fs/btrfs/disk-io.c
parentBtrfs: Update the highest objectid in a root after log replay is done (diff)
downloadkernel-qcow2-linux-98509cfc5a6857bddcfe4b19a9539726655ec9bd.tar.gz
kernel-qcow2-linux-98509cfc5a6857bddcfe4b19a9539726655ec9bd.tar.xz
kernel-qcow2-linux-98509cfc5a6857bddcfe4b19a9539726655ec9bd.zip
Btrfs: Fix releasepage to properly keep dirty and writeback pages
Signed-off-by: Chris Mason <chris.mason@oracle.com>
Diffstat (limited to 'fs/btrfs/disk-io.c')
-rw-r--r--fs/btrfs/disk-io.c5
1 files changed, 4 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;