aboutsummaryrefslogtreecommitdiffstats
path: root/fs/btrfs/disk-io.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/btrfs/disk-io.c')
-rw-r--r--fs/btrfs/disk-io.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c
index 731a534f81f5..5d1f9bca2712 100644
--- a/fs/btrfs/disk-io.c
+++ b/fs/btrfs/disk-io.c
@@ -193,6 +193,7 @@ int csum_dirty_buffer(struct btrfs_root *root, struct page *page)
193 } 193 }
194 eb = alloc_extent_buffer(tree, start, len, page, GFP_NOFS); 194 eb = alloc_extent_buffer(tree, start, len, page, GFP_NOFS);
195 read_extent_buffer_pages(tree, eb, start + PAGE_CACHE_SIZE, 1); 195 read_extent_buffer_pages(tree, eb, start + PAGE_CACHE_SIZE, 1);
196 btrfs_clear_buffer_defrag(eb);
196 found_start = btrfs_header_bytenr(eb); 197 found_start = btrfs_header_bytenr(eb);
197 if (found_start != start) { 198 if (found_start != start) {
198 printk("warning: eb start incorrect %Lu buffer %Lu len %lu\n", 199 printk("warning: eb start incorrect %Lu buffer %Lu len %lu\n",
@@ -676,6 +677,8 @@ struct btrfs_root *open_ctree(struct super_block *sb)
676 fs_info->do_barriers = 1; 677 fs_info->do_barriers = 1;
677 fs_info->closing = 0; 678 fs_info->closing = 0;
678 fs_info->total_pinned = 0; 679 fs_info->total_pinned = 0;
680 fs_info->last_alloc = 0;
681
679#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,18) 682#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,18)
680 INIT_WORK(&fs_info->trans_work, btrfs_transaction_cleaner, fs_info); 683 INIT_WORK(&fs_info->trans_work, btrfs_transaction_cleaner, fs_info);
681#else 684#else