From 460c59914333be8bc72cf750d980f6eaad663568 Mon Sep 17 00:00:00 2001 From: Zdenek Kabelac Date: Tue, 4 Oct 2011 16:22:38 +0000 Subject: [PATCH] Name changes typo zeroeing->zeroing add size low_water_mark->low_water_mark_size so it's more obvious its sector related variable. --- libdm/libdevmapper.h | 4 ++-- libdm/libdm-deptree.c | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/libdm/libdevmapper.h b/libdm/libdevmapper.h index 17c78f326..419699f34 100644 --- a/libdm/libdevmapper.h +++ b/libdm/libdevmapper.h @@ -542,8 +542,8 @@ int dm_tree_node_add_thin_pool_target(struct dm_tree_node *node, const char *pool_uuid, const char *metadata_uuid, uint32_t data_block_size, - uint64_t low_water_mark, - unsigned skip_block_zeroeing); /* Maybe separate _set_ call ? */ + uint64_t low_water_mark_size, + unsigned skip_block_zeroing); int dm_tree_node_add_thin_target(struct dm_tree_node *node, uint64_t size, diff --git a/libdm/libdm-deptree.c b/libdm/libdm-deptree.c index 7a12e6241..40b53237b 100644 --- a/libdm/libdm-deptree.c +++ b/libdm/libdm-deptree.c @@ -169,9 +169,9 @@ struct load_segment { struct dm_tree_node *metadata; /* Thin_pool */ struct dm_tree_node *pool; /* Thin_pool, Thin */ - uint64_t low_water_mark; /* Thin_pool */ + uint64_t low_water_mark_size; /* Thin_pool */ uint32_t data_block_size; /* Thin_pool */ - unsigned skip_block_zeroeing; /* Thin_pool */ + unsigned skip_block_zeroing; /* Thin_pool */ uint32_t device_id; /* Thin */ }; @@ -1978,8 +1978,8 @@ static int _emit_segment_line(struct dm_task *dmt, uint32_t major, if (!_build_dev_string(pool, sizeof(pool), seg->pool)) return_0; EMIT_PARAMS(pos, "%s %s %d %" PRIu64 " %s", metadata, pool, - seg->data_block_size, seg->low_water_mark, - seg->skip_block_zeroeing ? "1 skip_block_zeroing" : ""); + seg->data_block_size, seg->low_water_mark_size, + seg->skip_block_zeroing ? "1 skip_block_zeroing" : ""); break; case SEG_THIN: if (!_build_dev_string(pool, sizeof(pool), seg->pool)) @@ -2715,8 +2715,8 @@ int dm_tree_node_add_thin_pool_target(struct dm_tree_node *node, const char *pool_uuid, const char *metadata_uuid, uint32_t data_block_size, - uint64_t low_water_mark, - unsigned skip_block_zeroeing) + uint64_t low_water_mark_size, + unsigned skip_block_zeroing) { struct load_segment *seg; @@ -2754,9 +2754,9 @@ int dm_tree_node_add_thin_pool_target(struct dm_tree_node *node, return_0; node->props.thin_pool_transaction_id = transaction_id; // compare on resume - seg->low_water_mark = low_water_mark; + seg->low_water_mark_size = low_water_mark_size; seg->data_block_size = data_block_size; - seg->skip_block_zeroeing = skip_block_zeroeing; + seg->skip_block_zeroing = skip_block_zeroing; return 1; } -- 2.43.5