diff options
author | Chris Mason <chris.mason@oracle.com> | 2009-10-01 17:24:44 -0400 |
---|---|---|
committer | Chris Mason <chris.mason@oracle.com> | 2009-10-01 17:24:44 -0400 |
commit | 9c2693c9243b81802c6860570557165e874779a7 (patch) | |
tree | c857a96a78cdc9fcd640ea4279e7214d6c9713b3 | |
parent | 8aa38c31b7659e338fee4d9af4c3805acbd9806f (diff) | |
parent | fbf190874407f23d2891b53ffdf7d3c6be8d47ff (diff) | |
download | kernel_samsung_tuna-9c2693c9243b81802c6860570557165e874779a7.zip kernel_samsung_tuna-9c2693c9243b81802c6860570557165e874779a7.tar.gz kernel_samsung_tuna-9c2693c9243b81802c6860570557165e874779a7.tar.bz2 |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable into for-linus
-rw-r--r-- | fs/btrfs/inode.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index 5b9c8e0..f400111 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -4909,10 +4909,21 @@ again: goto again; } + /* + * XXX - page_mkwrite gets called every time the page is dirtied, even + * if it was already dirty, so for space accounting reasons we need to + * clear any delalloc bits for the range we are fixing to save. There + * is probably a better way to do this, but for now keep consistent with + * prepare_pages in the normal write path. + */ + clear_extent_bits(&BTRFS_I(inode)->io_tree, page_start, page_end, + EXTENT_DIRTY | EXTENT_DELALLOC, GFP_NOFS); + ret = btrfs_set_extent_delalloc(inode, page_start, page_end); if (ret) { unlock_extent(io_tree, page_start, page_end, GFP_NOFS); ret = VM_FAULT_SIGBUS; + btrfs_free_reserved_data_space(root, inode, PAGE_CACHE_SIZE); goto out_unlock; } ret = 0; |