mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-23 17:30:02 +00:00
dm btree remove: remove unused function get_nr_entries()
rebalance_children() calls get_nr_entries() and assigns the result to an unused local 'child_entries' variable. Remove get_nr_entries() and cleanup rebalance_children() accordingly. Signed-off-by: Vivek Goyal <vgoyal@redhat.com> Signed-off-by: Mike Snitzer <snitzer@redhat.com>
This commit is contained in:
parent
0a8d4c3ef8
commit
8c747fd0c3
1 changed files with 0 additions and 22 deletions
|
@ -409,29 +409,11 @@ static int rebalance3(struct shadow_spine *s, struct dm_btree_info *info,
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int get_nr_entries(struct dm_transaction_manager *tm,
|
|
||||||
dm_block_t b, uint32_t *result)
|
|
||||||
{
|
|
||||||
int r;
|
|
||||||
struct dm_block *block;
|
|
||||||
struct btree_node *n;
|
|
||||||
|
|
||||||
r = dm_tm_read_lock(tm, b, &btree_node_validator, &block);
|
|
||||||
if (r)
|
|
||||||
return r;
|
|
||||||
|
|
||||||
n = dm_block_data(block);
|
|
||||||
*result = le32_to_cpu(n->header.nr_entries);
|
|
||||||
|
|
||||||
return dm_tm_unlock(tm, block);
|
|
||||||
}
|
|
||||||
|
|
||||||
static int rebalance_children(struct shadow_spine *s,
|
static int rebalance_children(struct shadow_spine *s,
|
||||||
struct dm_btree_info *info,
|
struct dm_btree_info *info,
|
||||||
struct dm_btree_value_type *vt, uint64_t key)
|
struct dm_btree_value_type *vt, uint64_t key)
|
||||||
{
|
{
|
||||||
int i, r, has_left_sibling, has_right_sibling;
|
int i, r, has_left_sibling, has_right_sibling;
|
||||||
uint32_t child_entries;
|
|
||||||
struct btree_node *n;
|
struct btree_node *n;
|
||||||
|
|
||||||
n = dm_block_data(shadow_current(s));
|
n = dm_block_data(shadow_current(s));
|
||||||
|
@ -458,10 +440,6 @@ static int rebalance_children(struct shadow_spine *s,
|
||||||
if (i < 0)
|
if (i < 0)
|
||||||
return -ENODATA;
|
return -ENODATA;
|
||||||
|
|
||||||
r = get_nr_entries(info->tm, value64(n, i), &child_entries);
|
|
||||||
if (r)
|
|
||||||
return r;
|
|
||||||
|
|
||||||
has_left_sibling = i > 0;
|
has_left_sibling = i > 0;
|
||||||
has_right_sibling = i < (le32_to_cpu(n->header.nr_entries) - 1);
|
has_right_sibling = i < (le32_to_cpu(n->header.nr_entries) - 1);
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue