From a8effd2fe88fac345e6b95f5f845af1ad5025336 Mon Sep 17 00:00:00 2001 From: Josef Bacik Date: Fri, 31 May 2013 13:04:36 -0400 Subject: [PATCH] --- yaml --- r: 377087 b: refs/heads/master c: a9995eece39a0630ebbfc1ab38570bce6c8a8f5b h: refs/heads/master i: 377085: 5aff339c31f979f81d1046a678176283ff0e87c5 377083: b94599e16a3f8c6f9c5ac06df0ff95e1e2aa6023 377079: 754b08205ad112258ffd21186cf02f786429666c 377071: 9ebbb5da93da301f19d550de5e0d3011d116651e 377055: bee2641ec00c0ec897ff0b3312d069d2a2d63cd5 377023: a040f17d80ca9888f26bf1a02e6ca1ff7277c52d 376959: 3f0d9f7aa136721949d33b0602678e028166bf57 376831: 2085f68627b39d9dd213de99e6bc2b2015ecea4e v: v3 --- [refs] | 2 +- trunk/fs/btrfs/relocation.c | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 70bf2e98289d..a7db475b2f10 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6379ef9fb2482a92b5fe09f927d6ce1f989c0c6d +refs/heads/master: a9995eece39a0630ebbfc1ab38570bce6c8a8f5b diff --git a/trunk/fs/btrfs/relocation.c b/trunk/fs/btrfs/relocation.c index 395b82031a42..4febca4fc2de 100644 --- a/trunk/fs/btrfs/relocation.c +++ b/trunk/fs/btrfs/relocation.c @@ -4082,7 +4082,7 @@ struct inode *create_reloc_inode(struct btrfs_fs_info *fs_info, return inode; } -static struct reloc_control *alloc_reloc_control(void) +static struct reloc_control *alloc_reloc_control(struct btrfs_fs_info *fs_info) { struct reloc_control *rc; @@ -4093,7 +4093,8 @@ static struct reloc_control *alloc_reloc_control(void) INIT_LIST_HEAD(&rc->reloc_roots); backref_cache_init(&rc->backref_cache); mapping_tree_init(&rc->reloc_root_tree); - extent_io_tree_init(&rc->processed_blocks, NULL); + extent_io_tree_init(&rc->processed_blocks, + fs_info->btree_inode->i_mapping); return rc; } @@ -4110,7 +4111,7 @@ int btrfs_relocate_block_group(struct btrfs_root *extent_root, u64 group_start) int rw = 0; int err = 0; - rc = alloc_reloc_control(); + rc = alloc_reloc_control(fs_info); if (!rc) return -ENOMEM; @@ -4311,7 +4312,7 @@ int btrfs_recover_relocation(struct btrfs_root *root) if (list_empty(&reloc_roots)) goto out; - rc = alloc_reloc_control(); + rc = alloc_reloc_control(root->fs_info); if (!rc) { err = -ENOMEM; goto out;