From fc260f5bcb9445397a6140f9bffe141159fd43fd Mon Sep 17 00:00:00 2001 From: Zdenek Kabelac Date: Wed, 19 Oct 2011 16:36:39 +0000 Subject: [PATCH] Just indent changes Some tabs & spaces. --- lib/metadata/lv_manip.c | 1 + lib/metadata/thin_manip.c | 34 +++++++++++++++++----------------- libdm/libdm-deptree.c | 2 -- 3 files changed, 18 insertions(+), 19 deletions(-) diff --git a/lib/metadata/lv_manip.c b/lib/metadata/lv_manip.c index e6800cf7e..e3655228f 100644 --- a/lib/metadata/lv_manip.c +++ b/lib/metadata/lv_manip.c @@ -511,6 +511,7 @@ static int _lv_reduce(struct logical_volume *lv, uint32_t extents, int delete) /* FIXME Check this is safe */ if (seg->log_lv && !lv_remove(seg->log_lv)) return_0; + if (seg->pool_metadata_lv && !lv_remove(seg->pool_metadata_lv)) return_0; diff --git a/lib/metadata/thin_manip.c b/lib/metadata/thin_manip.c index fbaeda1a6..c66e527a0 100644 --- a/lib/metadata/thin_manip.c +++ b/lib/metadata/thin_manip.c @@ -21,9 +21,9 @@ int attach_pool_metadata_lv(struct lv_segment *seg, struct logical_volume *pool_ { seg->pool_metadata_lv = pool_metadata_lv; pool_metadata_lv->status |= THIN_POOL_METADATA; - lv_set_hidden(pool_metadata_lv); + lv_set_hidden(pool_metadata_lv); - return add_seg_to_segs_using_this_lv(pool_metadata_lv, seg); + return add_seg_to_segs_using_this_lv(pool_metadata_lv, seg); } int attach_pool_data_lv(struct lv_segment *seg, struct logical_volume *pool_data_lv) @@ -31,9 +31,9 @@ int attach_pool_data_lv(struct lv_segment *seg, struct logical_volume *pool_data if (!set_lv_segment_area_lv(seg, 0, pool_data_lv, 0, THIN_POOL_DATA)) return_0; - lv_set_hidden(pool_data_lv); + lv_set_hidden(pool_data_lv); - return 1; + return 1; } int attach_pool_lv(struct lv_segment *seg, struct logical_volume *pool_lv) @@ -41,7 +41,7 @@ int attach_pool_lv(struct lv_segment *seg, struct logical_volume *pool_lv) seg->pool_lv = pool_lv; seg->lv->status |= THIN_VOLUME; - return add_seg_to_segs_using_this_lv(pool_lv, seg); + return add_seg_to_segs_using_this_lv(pool_lv, seg); } int detach_pool_lv(struct lv_segment *seg) @@ -117,22 +117,22 @@ int detach_pool_messages(struct lv_segment *seg) struct lv_segment *find_pool_seg(const struct lv_segment *seg) { - struct lv_segment *pool_seg; + struct lv_segment *pool_seg; - pool_seg = get_only_segment_using_this_lv(seg->lv); + pool_seg = get_only_segment_using_this_lv(seg->lv); - if (!pool_seg) { - log_error("Failed to find pool_seg for %s", seg->lv->name); - return NULL; - } + if (!pool_seg) { + log_error("Failed to find pool_seg for %s", seg->lv->name); + return NULL; + } - if (!seg_is_thin_pool(pool_seg)) { - log_error("%s on %s is not a pool segment", - pool_seg->lv->name, seg->lv->name); - return NULL; - } + if (!seg_is_thin_pool(pool_seg)) { + log_error("%s on %s is not a pool segment", + pool_seg->lv->name, seg->lv->name); + return NULL; + } - return pool_seg; + return pool_seg; } /* diff --git a/libdm/libdm-deptree.c b/libdm/libdm-deptree.c index 7125df632..90a102006 100644 --- a/libdm/libdm-deptree.c +++ b/libdm/libdm-deptree.c @@ -1342,7 +1342,6 @@ static int _thin_pool_node_send_messages(struct dm_tree_node *dnode, return 1; seg = dm_list_item(dm_list_last(&dnode->props.segs), struct load_segment); - if (seg->type != SEG_THIN_POOL) return 1; @@ -2887,7 +2886,6 @@ int dm_tree_node_add_thin_pool_message(struct dm_tree_node *node, } seg = dm_list_item(dm_list_last(&node->props.segs), struct load_segment); - if (seg->type != SEG_THIN_POOL) { log_error(INTERNAL_ERROR "Attempt to use non thin pool segment %s.", dm_segtypes[seg->type].target); -- 2.43.5