diff options
| author |   Jeff Mahoney <jeffm@suse.com> | 2016-06-16 11:30:29 -0400 |
|---|---|---|
| committer |   David Sterba <dsterba@suse.com> | 2016-12-06 16:06:58 +0100 |
| commit | 3796d335356acccd03282547d852f41e48063766 (patch) | |
| tree | 3f1601a70ba912d2bbb819a08bdf35e3321b5c79 /fs/btrfs/extent-tree.c | |
| parent | btrfs: root->fs_info cleanup, btrfs_calc_{trans,trunc}_metadata_size (diff) | |
| download | linux-dev-3796d335356acccd03282547d852f41e48063766.tar.xz linux-dev-3796d335356acccd03282547d852f41e48063766.zip | |
btrfs: root->fs_info cleanup, lock/unlock_chunks
Signed-off-by: Jeff Mahoney <jeffm@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to 'fs/btrfs/extent-tree.c')
| -rw-r--r-- | fs/btrfs/extent-tree.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c index b8ad81c69eb9..cc9ae54036be 100644 --- a/fs/btrfs/extent-tree.c +++ b/fs/btrfs/extent-tree.c @@ -9436,9 +9436,9 @@ again: out: if (cache->flags & BTRFS_BLOCK_GROUP_SYSTEM) { alloc_flags = update_block_group_flags(root, cache->flags); - lock_chunks(root->fs_info->chunk_root); + lock_chunks(root->fs_info); check_system_chunk(trans, root, alloc_flags); - unlock_chunks(root->fs_info->chunk_root); + unlock_chunks(root->fs_info); } mutex_unlock(&root->fs_info->ro_block_group_mutex); @@ -10482,7 +10482,7 @@ int btrfs_remove_block_group(struct btrfs_trans_handle *trans, memcpy(&key, &block_group->key, sizeof(key)); - lock_chunks(root); + lock_chunks(root->fs_info); if (!list_empty(&em->list)) { /* We're in the transaction->pending_chunks list. */ free_extent_map(em); @@ -10550,7 +10550,7 @@ int btrfs_remove_block_group(struct btrfs_trans_handle *trans, free_extent_map(em); } - unlock_chunks(root); + unlock_chunks(root->fs_info); ret = remove_block_group_free_space(trans, root->fs_info, block_group); if (ret) |