leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

btrfs: Remove fs_info from btrfs_finish_chunk_alloc

Browse Source 
It can be referenced from the passed transaction handle.

Signed-off-by: Nikolay Borisov <nborisov@suse.com>
Reviewed-by: Lu Fengqi <lufq.fnst@cn.fujitsu.com>
Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
Nikolay Borisov 2018-07-20 19:37:53 +03:00 committed by David Sterba
parent f4208794d0
commit 97aff912a2
3 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
fs/btrfs/extent-tree.c
View File

@ -10022,8 +10022,7 @@ void btrfs_create_pending_block_groups(struct btrfs_trans_handle *trans)
sizeof(item)); sizeof(item));
if (ret) if (ret)
btrfs_abort_transaction(trans, ret); btrfs_abort_transaction(trans, ret);
ret = btrfs_finish_chunk_alloc(trans, fs_info, key.objectid, ret = btrfs_finish_chunk_alloc(trans, key.objectid, key.offset);
key.offset);
if (ret) if (ret)
btrfs_abort_transaction(trans, ret); btrfs_abort_transaction(trans, ret);
add_block_group_free_space(trans, block_group); add_block_group_free_space(trans, block_group);
@ -10594,8 +10593,7 @@ void btrfs_delete_unused_bgs(struct btrfs_fs_info *fs_info)
* Btrfs_remove_chunk will abort the transaction if things go * Btrfs_remove_chunk will abort the transaction if things go
* horribly wrong. * horribly wrong.
*/ */
ret = btrfs_remove_chunk(trans, fs_info, ret = btrfs_remove_chunk(trans, block_group->key.objectid);
block_group->key.objectid);
if (ret) { if (ret) {
if (trimming) if (trimming)

10
fs/btrfs/volumes.c
View File

@ -2716,9 +2716,9 @@ static struct extent_map *get_chunk_map(struct btrfs_fs_info *fs_info,
return em; return em;
} }
int btrfs_remove_chunk(struct btrfs_trans_handle *trans, int btrfs_remove_chunk(struct btrfs_trans_handle *trans, u64 chunk_offset)
struct btrfs_fs_info *fs_info, u64 chunk_offset)
{ {
struct btrfs_fs_info *fs_info = trans->fs_info;
struct extent_map *em; struct extent_map *em;
struct map_lookup *map; struct map_lookup *map;
u64 dev_extent_len = 0; u64 dev_extent_len = 0;
@ -2858,7 +2858,7 @@ static int btrfs_relocate_chunk(struct btrfs_fs_info *fs_info, u64 chunk_offset)
* step two, delete the device extents and the * step two, delete the device extents and the
* chunk tree entries * chunk tree entries
*/ */
ret = btrfs_remove_chunk(trans, fs_info, chunk_offset); ret = btrfs_remove_chunk(trans, chunk_offset);
btrfs_end_transaction(trans); btrfs_end_transaction(trans);
return ret; return ret;
} }
@ -4842,9 +4842,9 @@ error:
} }
int btrfs_finish_chunk_alloc(struct btrfs_trans_handle *trans, int btrfs_finish_chunk_alloc(struct btrfs_trans_handle *trans,
struct btrfs_fs_info *fs_info, u64 chunk_offset, u64 chunk_size)
u64 chunk_offset, u64 chunk_size)
{ {
struct btrfs_fs_info *fs_info = trans->fs_info;
struct btrfs_root *extent_root = fs_info->extent_root; struct btrfs_root *extent_root = fs_info->extent_root;
struct btrfs_root *chunk_root = fs_info->chunk_root; struct btrfs_root *chunk_root = fs_info->chunk_root;
struct btrfs_key key; struct btrfs_key key;

6
fs/btrfs/volumes.h
View File

@ -462,10 +462,8 @@ int btrfs_is_parity_mirror(struct btrfs_fs_info *fs_info,
unsigned long btrfs_full_stripe_len(struct btrfs_fs_info *fs_info, unsigned long btrfs_full_stripe_len(struct btrfs_fs_info *fs_info,
u64 logical); u64 logical);
int btrfs_finish_chunk_alloc(struct btrfs_trans_handle *trans, int btrfs_finish_chunk_alloc(struct btrfs_trans_handle *trans,
struct btrfs_fs_info *fs_info, u64 chunk_offset, u64 chunk_size);
u64 chunk_offset, u64 chunk_size); int btrfs_remove_chunk(struct btrfs_trans_handle *trans, u64 chunk_offset);
int btrfs_remove_chunk(struct btrfs_trans_handle *trans,
struct btrfs_fs_info *fs_info, u64 chunk_offset);
static inline void btrfs_dev_stat_inc(struct btrfs_device *dev, static inline void btrfs_dev_stat_inc(struct btrfs_device *dev,
int index) int index)