mirror of
https://github.com/torvalds/linux.git
synced 2026-05-30 10:04:04 +02:00
dm vdo: remove checks that can not fail
Remove checks that can't fail. Signed-off-by: Matthew Sakai <msakai@redhat.com> Signed-off-by: Mikulas Patocka <mpatocka@redhat.com>
This commit is contained in:
parent
f4e99b846c
commit
148a9cec84
|
|
@ -44,9 +44,6 @@ enum {
|
|||
/* The default size of each slab journal, in blocks */
|
||||
DEFAULT_VDO_SLAB_JOURNAL_SIZE = 224,
|
||||
|
||||
/* Unit test minimum */
|
||||
MINIMUM_VDO_SLAB_JOURNAL_BLOCKS = 2,
|
||||
|
||||
/*
|
||||
* The initial size of lbn_operations and pbn_operations, which is based upon the expected
|
||||
* maximum number of outstanding VIOs. This value was chosen to make it highly unlikely
|
||||
|
|
|
|||
|
|
@ -711,24 +711,11 @@ int vdo_configure_slab(block_count_t slab_size, block_count_t slab_journal_block
|
|||
ref_blocks = vdo_get_saved_reference_count_size(slab_size - slab_journal_blocks);
|
||||
meta_blocks = (ref_blocks + slab_journal_blocks);
|
||||
|
||||
/* Make sure test code hasn't configured slabs to be too small. */
|
||||
/* Make sure configured slabs are not too small. */
|
||||
if (meta_blocks >= slab_size)
|
||||
return VDO_BAD_CONFIGURATION;
|
||||
|
||||
/*
|
||||
* If the slab size is very small, assume this must be a unit test and override the number
|
||||
* of data blocks to be a power of two (wasting blocks in the slab). Many tests need their
|
||||
* data_blocks fields to be the exact capacity of the configured volume, and that used to
|
||||
* fall out since they use a power of two for the number of data blocks, the slab size was
|
||||
* a power of two, and every block in a slab was a data block.
|
||||
*
|
||||
* TODO: Try to figure out some way of structuring testParameters and unit tests so this
|
||||
* hack isn't needed without having to edit several unit tests every time the metadata size
|
||||
* changes by one block.
|
||||
*/
|
||||
data_blocks = slab_size - meta_blocks;
|
||||
if ((slab_size < 1024) && !is_power_of_2(data_blocks))
|
||||
data_blocks = ((block_count_t) 1 << ilog2(data_blocks));
|
||||
|
||||
/*
|
||||
* Configure the slab journal thresholds. The flush threshold is 168 of 224 blocks in
|
||||
|
|
@ -1221,11 +1208,6 @@ int vdo_validate_config(const struct vdo_config *config,
|
|||
if (result != VDO_SUCCESS)
|
||||
return result;
|
||||
|
||||
result = VDO_ASSERT(config->slab_journal_blocks >= MINIMUM_VDO_SLAB_JOURNAL_BLOCKS,
|
||||
"slab journal size meets minimum size");
|
||||
if (result != VDO_SUCCESS)
|
||||
return result;
|
||||
|
||||
result = VDO_ASSERT(config->slab_journal_blocks <= config->slab_size,
|
||||
"slab journal size is within expected bound");
|
||||
if (result != VDO_SUCCESS)
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user