diff options
author | Vivek Goyal <vgoyal@redhat.com> | 2015-07-06 11:55:41 -0400 |
---|---|---|
committer | Mike Snitzer <snitzer@redhat.com> | 2015-08-12 11:32:19 -0400 |
commit | 8c747fd0c3f514233afaca98139c03cca2cf2d2f (patch) | |
tree | 4d122d214d14d36cc6adb1ad2170bf8a15a5eae3 /drivers/md/persistent-data | |
parent | 0a8d4c3ef8f14cbd26d97767e3676722d4eebee5 (diff) |
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>
Diffstat (limited to 'drivers/md/persistent-data')
-rw-r--r-- | drivers/md/persistent-data/dm-btree-remove.c | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/drivers/md/persistent-data/dm-btree-remove.c b/drivers/md/persistent-data/dm-btree-remove.c index 4222f774cf36..421a36c593e3 100644 --- a/drivers/md/persistent-data/dm-btree-remove.c +++ b/drivers/md/persistent-data/dm-btree-remove.c | |||
@@ -409,29 +409,11 @@ static int rebalance3(struct shadow_spine *s, struct dm_btree_info *info, | |||
409 | return 0; | 409 | return 0; |
410 | } | 410 | } |
411 | 411 | ||
412 | static int get_nr_entries(struct dm_transaction_manager *tm, | ||
413 | dm_block_t b, uint32_t *result) | ||
414 | { | ||
415 | int r; | ||
416 | struct dm_block *block; | ||
417 | struct btree_node *n; | ||
418 | |||
419 | r = dm_tm_read_lock(tm, b, &btree_node_validator, &block); | ||
420 | if (r) | ||
421 | return r; | ||
422 | |||
423 | n = dm_block_data(block); | ||
424 | *result = le32_to_cpu(n->header.nr_entries); | ||
425 | |||
426 | return dm_tm_unlock(tm, block); | ||
427 | } | ||
428 | |||
429 | static int rebalance_children(struct shadow_spine *s, | 412 | static int rebalance_children(struct shadow_spine *s, |
430 | struct dm_btree_info *info, | 413 | struct dm_btree_info *info, |
431 | struct dm_btree_value_type *vt, uint64_t key) | 414 | struct dm_btree_value_type *vt, uint64_t key) |
432 | { | 415 | { |
433 | int i, r, has_left_sibling, has_right_sibling; | 416 | int i, r, has_left_sibling, has_right_sibling; |
434 | uint32_t child_entries; | ||
435 | struct btree_node *n; | 417 | struct btree_node *n; |
436 | 418 | ||
437 | n = dm_block_data(shadow_current(s)); | 419 | n = dm_block_data(shadow_current(s)); |
@@ -458,10 +440,6 @@ static int rebalance_children(struct shadow_spine *s, | |||
458 | if (i < 0) | 440 | if (i < 0) |
459 | return -ENODATA; | 441 | return -ENODATA; |
460 | 442 | ||
461 | r = get_nr_entries(info->tm, value64(n, i), &child_entries); | ||
462 | if (r) | ||
463 | return r; | ||
464 | |||
465 | has_left_sibling = i > 0; | 443 | has_left_sibling = i > 0; |
466 | has_right_sibling = i < (le32_to_cpu(n->header.nr_entries) - 1); | 444 | has_right_sibling = i < (le32_to_cpu(n->header.nr_entries) - 1); |
467 | 445 | ||