From 642108900d73b5c2b3fb48b751e1ced151e0a47a Mon Sep 17 00:00:00 2001 From: Chris Mason Date: Thu, 8 Oct 2009 12:30:20 -0400 Subject: [PATCH] --- yaml --- r: 167255 b: refs/heads/master c: a3429ab70b04363c6190964e82f04f44f3e34cf0 h: refs/heads/master i: 167253: 20341fd51e03d7fc61bfe125b3ab28c4fbebf637 167251: bd7351d77ad09ddfe8a94c48df7a58c9477d4115 167247: 96cf02bf1ae1b8d3e287552b2838657d8e173442 v: v3 --- [refs] | 2 +- trunk/fs/btrfs/inode.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index c2305405bbe7..a1e9e1504ec8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a791e35e12ff672e8a0e140abeeaf900c3b2ea77 +refs/heads/master: a3429ab70b04363c6190964e82f04f44f3e34cf0 diff --git a/trunk/fs/btrfs/inode.c b/trunk/fs/btrfs/inode.c index a7058fca3aab..401dfb2a94e8 100644 --- a/trunk/fs/btrfs/inode.c +++ b/trunk/fs/btrfs/inode.c @@ -427,6 +427,7 @@ static noinline int compress_file_range(struct inode *inode, &BTRFS_I(inode)->io_tree, start, end, NULL, EXTENT_CLEAR_UNLOCK_PAGE | EXTENT_CLEAR_DIRTY | + EXTENT_CLEAR_DELALLOC | EXTENT_SET_WRITEBACK | EXTENT_END_WRITEBACK); ret = 0; goto free_pages_out; @@ -644,6 +645,7 @@ static noinline int submit_compressed_extents(struct inode *inode, async_extent->ram_size - 1, NULL, EXTENT_CLEAR_UNLOCK_PAGE | EXTENT_CLEAR_UNLOCK | + EXTENT_CLEAR_DELALLOC | EXTENT_CLEAR_DIRTY | EXTENT_SET_WRITEBACK); ret = btrfs_submit_compressed_write(inode, @@ -877,8 +879,8 @@ static int cow_file_range_async(struct inode *inode, struct page *locked_page, u64 cur_end; int limit = 10 * 1024 * 1042; - clear_extent_bit(&BTRFS_I(inode)->io_tree, start, end, EXTENT_LOCKED | - EXTENT_DELALLOC, 1, 0, NULL, GFP_NOFS); + clear_extent_bit(&BTRFS_I(inode)->io_tree, start, end, EXTENT_LOCKED, + 1, 0, NULL, GFP_NOFS); while (start < end) { async_cow = kmalloc(sizeof(*async_cow), GFP_NOFS); async_cow->inode = inode;