btrfs-progs: Remove unnecessary parameter for btrfs_add_block_group

@chunk_objectid of btrfs_make_block_group() function is always fixed to
BTRFS_FIRST_FREE_OBJECTID, so there is no need to pass it as parameter
explicitly.

Signed-off-by: Qu Wenruo <wqu@suse.com>
Reviewed-by: Nikolay Borisov <nborisov@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
master
Qu Wenruo 2018-01-24 10:30:28 +08:00 committed by David Sterba
parent e4df433b8a
commit 1945854e01
5 changed files with 13 additions and 22 deletions

View File

@ -13088,7 +13088,7 @@ static int repair_chunk_item(struct btrfs_trans_handle *trans,
if (err & REFERENCER_MISSING) { if (err & REFERENCER_MISSING) {
ret = btrfs_make_block_group(trans, chunk_root->fs_info, 0, ret = btrfs_make_block_group(trans, chunk_root->fs_info, 0,
type, chunk_key.objectid, chunk_key.offset, length); type, chunk_key.offset, length);
if (ret) { if (ret) {
error("fail to add block group item[%llu %llu]", error("fail to add block group item[%llu %llu]",
chunk_key.offset, length); chunk_key.offset, length);
@ -13680,8 +13680,7 @@ static int reset_block_groups(struct btrfs_fs_info *fs_info)
chunk = btrfs_item_ptr(leaf, path.slots[0], struct btrfs_chunk); chunk = btrfs_item_ptr(leaf, path.slots[0], struct btrfs_chunk);
btrfs_add_block_group(fs_info, 0, btrfs_add_block_group(fs_info, 0,
btrfs_chunk_type(leaf, chunk), btrfs_chunk_type(leaf, chunk), key.offset,
key.objectid, key.offset,
btrfs_chunk_length(leaf, chunk)); btrfs_chunk_length(leaf, chunk));
set_extent_dirty(&fs_info->free_space_cache, key.offset, set_extent_dirty(&fs_info->free_space_cache, key.offset,
key.offset + btrfs_chunk_length(leaf, chunk)); key.offset + btrfs_chunk_length(leaf, chunk));

View File

@ -916,9 +916,7 @@ static int make_convert_data_block_groups(struct btrfs_trans_handle *trans,
if (ret < 0) if (ret < 0)
break; break;
ret = btrfs_make_block_group(trans, fs_info, 0, ret = btrfs_make_block_group(trans, fs_info, 0,
BTRFS_BLOCK_GROUP_DATA, BTRFS_BLOCK_GROUP_DATA, cur, len);
BTRFS_FIRST_CHUNK_TREE_OBJECTID,
cur, len);
if (ret < 0) if (ret < 0)
break; break;
cur += len; cur += len;

View File

@ -2529,11 +2529,10 @@ int btrfs_free_block_groups(struct btrfs_fs_info *info);
int btrfs_read_block_groups(struct btrfs_root *root); int btrfs_read_block_groups(struct btrfs_root *root);
struct btrfs_block_group_cache * struct btrfs_block_group_cache *
btrfs_add_block_group(struct btrfs_fs_info *fs_info, u64 bytes_used, u64 type, btrfs_add_block_group(struct btrfs_fs_info *fs_info, u64 bytes_used, u64 type,
u64 chunk_objectid, u64 chunk_offset, u64 size); u64 chunk_offset, u64 size);
int btrfs_make_block_group(struct btrfs_trans_handle *trans, int btrfs_make_block_group(struct btrfs_trans_handle *trans,
struct btrfs_fs_info *fs_info, u64 bytes_used, struct btrfs_fs_info *fs_info, u64 bytes_used,
u64 type, u64 chunk_objectid, u64 chunk_offset, u64 type, u64 chunk_offset, u64 size);
u64 size);
int btrfs_make_block_groups(struct btrfs_trans_handle *trans, int btrfs_make_block_groups(struct btrfs_trans_handle *trans,
struct btrfs_fs_info *fs_info); struct btrfs_fs_info *fs_info);
int btrfs_update_block_group(struct btrfs_root *root, u64 bytenr, u64 num, int btrfs_update_block_group(struct btrfs_root *root, u64 bytenr, u64 num,

View File

@ -1916,7 +1916,7 @@ static int do_chunk_alloc(struct btrfs_trans_handle *trans,
BUG_ON(ret); BUG_ON(ret);
ret = btrfs_make_block_group(trans, fs_info, 0, space_info->flags, ret = btrfs_make_block_group(trans, fs_info, 0, space_info->flags,
BTRFS_FIRST_CHUNK_TREE_OBJECTID, start, num_bytes); start, num_bytes);
BUG_ON(ret); BUG_ON(ret);
return 0; return 0;
} }
@ -3311,7 +3311,7 @@ error:
struct btrfs_block_group_cache * struct btrfs_block_group_cache *
btrfs_add_block_group(struct btrfs_fs_info *fs_info, u64 bytes_used, u64 type, btrfs_add_block_group(struct btrfs_fs_info *fs_info, u64 bytes_used, u64 type,
u64 chunk_objectid, u64 chunk_offset, u64 size) u64 chunk_offset, u64 size)
{ {
int ret; int ret;
int bit = 0; int bit = 0;
@ -3327,7 +3327,8 @@ btrfs_add_block_group(struct btrfs_fs_info *fs_info, u64 bytes_used, u64 type,
cache->key.type = BTRFS_BLOCK_GROUP_ITEM_KEY; cache->key.type = BTRFS_BLOCK_GROUP_ITEM_KEY;
btrfs_set_block_group_used(&cache->item, bytes_used); btrfs_set_block_group_used(&cache->item, bytes_used);
btrfs_set_block_group_chunk_objectid(&cache->item, chunk_objectid); btrfs_set_block_group_chunk_objectid(&cache->item,
BTRFS_FIRST_CHUNK_TREE_OBJECTID);
cache->flags = type; cache->flags = type;
btrfs_set_block_group_flags(&cache->item, type); btrfs_set_block_group_flags(&cache->item, type);
@ -3352,15 +3353,14 @@ btrfs_add_block_group(struct btrfs_fs_info *fs_info, u64 bytes_used, u64 type,
int btrfs_make_block_group(struct btrfs_trans_handle *trans, int btrfs_make_block_group(struct btrfs_trans_handle *trans,
struct btrfs_fs_info *fs_info, u64 bytes_used, struct btrfs_fs_info *fs_info, u64 bytes_used,
u64 type, u64 chunk_objectid, u64 chunk_offset, u64 type, u64 chunk_offset, u64 size)
u64 size)
{ {
int ret; int ret;
struct btrfs_root *extent_root = fs_info->extent_root; struct btrfs_root *extent_root = fs_info->extent_root;
struct btrfs_block_group_cache *cache; struct btrfs_block_group_cache *cache;
cache = btrfs_add_block_group(fs_info, bytes_used, type, cache = btrfs_add_block_group(fs_info, bytes_used, type, chunk_offset,
chunk_objectid, chunk_offset, size); size);
ret = btrfs_insert_item(trans, extent_root, &cache->key, &cache->item, ret = btrfs_insert_item(trans, extent_root, &cache->key, &cache->item,
sizeof(cache->item)); sizeof(cache->item));
BUG_ON(ret); BUG_ON(ret);

View File

@ -72,7 +72,6 @@ static int create_metadata_block_groups(struct btrfs_root *root, int mixed,
*/ */
ret = btrfs_make_block_group(trans, fs_info, bytes_used, ret = btrfs_make_block_group(trans, fs_info, bytes_used,
BTRFS_BLOCK_GROUP_SYSTEM, BTRFS_BLOCK_GROUP_SYSTEM,
BTRFS_FIRST_CHUNK_TREE_OBJECTID,
BTRFS_BLOCK_RESERVED_1M_FOR_SUPER, BTRFS_BLOCK_RESERVED_1M_FOR_SUPER,
BTRFS_MKFS_SYSTEM_GROUP_SIZE); BTRFS_MKFS_SYSTEM_GROUP_SIZE);
allocation->system += BTRFS_MKFS_SYSTEM_GROUP_SIZE; allocation->system += BTRFS_MKFS_SYSTEM_GROUP_SIZE;
@ -93,7 +92,6 @@ static int create_metadata_block_groups(struct btrfs_root *root, int mixed,
ret = btrfs_make_block_group(trans, fs_info, 0, ret = btrfs_make_block_group(trans, fs_info, 0,
BTRFS_BLOCK_GROUP_METADATA | BTRFS_BLOCK_GROUP_METADATA |
BTRFS_BLOCK_GROUP_DATA, BTRFS_BLOCK_GROUP_DATA,
BTRFS_FIRST_CHUNK_TREE_OBJECTID,
chunk_start, chunk_size); chunk_start, chunk_size);
if (ret) if (ret)
return ret; return ret;
@ -110,7 +108,6 @@ static int create_metadata_block_groups(struct btrfs_root *root, int mixed,
return ret; return ret;
ret = btrfs_make_block_group(trans, fs_info, 0, ret = btrfs_make_block_group(trans, fs_info, 0,
BTRFS_BLOCK_GROUP_METADATA, BTRFS_BLOCK_GROUP_METADATA,
BTRFS_FIRST_CHUNK_TREE_OBJECTID,
chunk_start, chunk_size); chunk_start, chunk_size);
allocation->metadata += chunk_size; allocation->metadata += chunk_size;
if (ret) if (ret)
@ -145,7 +142,6 @@ static int create_data_block_groups(struct btrfs_trans_handle *trans,
return ret; return ret;
ret = btrfs_make_block_group(trans, fs_info, 0, ret = btrfs_make_block_group(trans, fs_info, 0,
BTRFS_BLOCK_GROUP_DATA, BTRFS_BLOCK_GROUP_DATA,
BTRFS_FIRST_CHUNK_TREE_OBJECTID,
chunk_start, chunk_size); chunk_start, chunk_size);
allocation->data += chunk_size; allocation->data += chunk_size;
if (ret) if (ret)
@ -254,8 +250,7 @@ static int create_one_raid_group(struct btrfs_trans_handle *trans,
return ret; return ret;
ret = btrfs_make_block_group(trans, fs_info, 0, ret = btrfs_make_block_group(trans, fs_info, 0,
type, BTRFS_FIRST_CHUNK_TREE_OBJECTID, type, chunk_start, chunk_size);
chunk_start, chunk_size);
type &= BTRFS_BLOCK_GROUP_TYPE_MASK; type &= BTRFS_BLOCK_GROUP_TYPE_MASK;
if (type == BTRFS_BLOCK_GROUP_DATA) { if (type == BTRFS_BLOCK_GROUP_DATA) {