Btrfs: Properly clear dirty and delalloc extent bits while preparing the file for...

[safe/jmp/linux-2.6] / fs / btrfs / file.c

diff --git a/fs/btrfs/file.c b/fs/btrfs/file.c
index 7c10a90..1a47251 100644 (file)
--- a/fs/btrfs/file.c
+++ b/fs/btrfs/file.c
@@ -175,6 +175,7 @@ static int noinline insert_inline_extent(struct btrfs_trans_handle *trans,
                        leaf = path->nodes[0];
                        ei = btrfs_item_ptr(leaf, path->slots[0],
                                            struct btrfs_file_extent_item);
+                       inode->i_blocks += (offset + size - found_end) >> 9;
                }
                if (found_end < offset) {
                        ptr = btrfs_file_extent_inline_start(ei) + found_size;
@@ -184,6 +185,7 @@ static int noinline insert_inline_extent(struct btrfs_trans_handle *trans,
 insert:
                btrfs_release_path(root, path);
                datasize = offset + size - key.offset;
+               inode->i_blocks += datasize >> 9;
                datasize = btrfs_file_extent_calc_inline_size(datasize);
                ret = btrfs_insert_empty_item(trans, root, path, &key,
                                              datasize);
@@ -256,7 +258,6 @@ static int noinline dirty_and_release_pages(struct btrfs_trans_handle *trans,
                goto out_unlock;
        }
        btrfs_set_trans_block_group(trans, inode);
-       inode->i_blocks += num_bytes >> 9;
        hint_byte = 0;
 
        if ((end_of_last_block & 4095) == 0) {
@@ -265,16 +266,14 @@ static int noinline dirty_and_release_pages(struct btrfs_trans_handle *trans,
        set_extent_uptodate(io_tree, start_pos, end_of_last_block, GFP_NOFS);
 
        /* FIXME...EIEIO, ENOSPC and more */
-
        /* insert any holes we need to create */
-       if (inode->i_size < start_pos) {
+       if (isize < end_pos) {
                u64 last_pos_in_file;
                u64 hole_size;
                u64 mask = root->sectorsize - 1;
                last_pos_in_file = (isize + mask) & ~mask;
                hole_size = (end_pos - last_pos_in_file + mask) & ~mask;
-
-               if (last_pos_in_file < start_pos) {
+               if (last_pos_in_file < end_pos) {
                        err = btrfs_drop_extents(trans, root, inode,
                                                 last_pos_in_file,
                                                 last_pos_in_file + hole_size,
@@ -358,10 +357,13 @@ int btrfs_drop_extent_cache(struct inode *inode, u64 start, u64 end)
 {
        struct extent_map *em;
        struct extent_map_tree *em_tree = &BTRFS_I(inode)->extent_tree;
+       u64 len = end - start + 1;
 
+       if (end == (u64)-1)
+               len = (u64)-1;
        while(1) {
                spin_lock(&em_tree->lock);
-               em = lookup_extent_mapping(em_tree, start, end);
+               em = lookup_extent_mapping(em_tree, start, len);
                if (!em) {
                        spin_unlock(&em_tree->lock);
                        break;
@@ -412,7 +414,7 @@ int btrfs_check_file(struct btrfs_root *root, struct inode *inode)
                if (found_key.type != BTRFS_EXTENT_DATA_KEY)
                        goto out;
 
-               if (found_key.offset != last_offset) {
+               if (found_key.offset < last_offset) {
                        WARN_ON(1);
                        btrfs_print_leaf(root, leaf);
                        printk("inode %lu found offset %Lu expected %Lu\n",
@@ -437,7 +439,7 @@ int btrfs_check_file(struct btrfs_root *root, struct inode *inode)
                last_offset = extent_end;
                path->slots[0]++;
        }
-       if (last_offset < inode->i_size) {
+       if (0 && last_offset < inode->i_size) {
                WARN_ON(1);
                btrfs_print_leaf(root, leaf);
                printk("inode %lu found offset %Lu size %Lu\n", inode->i_ino,
@@ -509,11 +511,12 @@ next_slot:
                slot = path->slots[0];
                ret = 0;
                btrfs_item_key_to_cpu(leaf, &key, slot);
-
-               if (key.offset >= end || key.objectid != inode->i_ino) {
+               if (btrfs_key_type(&key) == BTRFS_EXTENT_DATA_KEY &&
+                   key.offset >= end) {
                        goto out;
                }
-               if (btrfs_key_type(&key) > BTRFS_EXTENT_DATA_KEY) {
+               if (btrfs_key_type(&key) > BTRFS_EXTENT_DATA_KEY ||
+                   key.objectid != inode->i_ino) {
                        goto out;
                }
                if (recow) {
@@ -591,8 +594,7 @@ next_slot:
                                }
                        }
                        bookend = 1;
-                       if (found_inline && start <= key.offset &&
-                           inline_limit < extent_end)
+                       if (found_inline && start <= key.offset)
                                keep = 1;
                }
                /* truncate existing extent */
@@ -610,8 +612,7 @@ next_slot:
                                                                      extent);
                                if (btrfs_file_extent_disk_bytenr(leaf,
                                                                  extent)) {
-                                       inode->i_blocks -=
-                                               (old_num - new_num) >> 9;
+                                       dec_i_blocks(inode, old_num - new_num);
                                }
                                btrfs_set_file_extent_num_bytes(leaf, extent,
                                                                new_num);
@@ -622,6 +623,8 @@ next_slot:
                                u32 new_size;
                                new_size = btrfs_file_extent_calc_inline_size(
                                                   inline_limit - key.offset);
+                               dec_i_blocks(inode, (extent_end - key.offset) -
+                                       (inline_limit - key.offset));
                                btrfs_truncate_item(trans, root, path,
                                                    new_size, 1);
                        }
@@ -655,7 +658,7 @@ next_slot:
                        btrfs_release_path(root, path);
                        extent = NULL;
                        if (found_extent && disk_bytenr != 0) {
-                               inode->i_blocks -= extent_num_bytes >> 9;
+                               dec_i_blocks(inode, extent_num_bytes);
                                ret = btrfs_free_extent(trans, root,
                                                disk_bytenr,
                                                disk_num_bytes,
@@ -672,11 +675,12 @@ next_slot:
                        if (!bookend)
                                continue;
                }
-               if (bookend && found_inline && start <= key.offset &&
-                   inline_limit < extent_end && key.offset <= inline_limit) {
+               if (bookend && found_inline && start <= key.offset) {
                        u32 new_size;
                        new_size = btrfs_file_extent_calc_inline_size(
-                                                  extent_end - inline_limit);
+                                                  extent_end - end);
+                       dec_i_blocks(inode, (extent_end - key.offset) -
+                                       (extent_end - end));
                        btrfs_truncate_item(trans, root, path, new_size, 0);
                }
                /* create bookend, splitting the extent in two */
@@ -721,6 +725,7 @@ next_slot:
        }
 out:
        btrfs_free_path(path);
+       btrfs_check_file(root, inode);
        return ret;
 }
 
@@ -757,6 +762,13 @@ static int prepare_pages(struct btrfs_root *root, struct file *file,
                set_page_extent_mapped(pages[i]);
                WARN_ON(!PageLocked(pages[i]));
        }
+       if (start_pos < inode->i_size) {
+               u64 last_pos;
+               last_pos = (index + num_pages) << PAGE_CACHE_SHIFT;
+               clear_extent_bits(&BTRFS_I(inode)->io_tree, start_pos,
+                                 last_pos - 1, EXTENT_DIRTY | EXTENT_DELALLOC,
+                                 GFP_NOFS);
+       }
        return 0;
 }