summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZdenek Kabelac <zkabelac@redhat.com>2023-03-06 14:52:28 +0100
committerZdenek Kabelac <zkabelac@redhat.com>2023-04-06 11:06:04 +0200
commit334117ee00aa6751ff7589b983497e1b7eee9d76 (patch)
tree92ae314b2a37c1a6f704f268224eb716940165ca
parent1fb3e08033570365580b576777e312d2f9c2d86d (diff)
downloadlvm2-334117ee00aa6751ff7589b983497e1b7eee9d76.tar.gz
cleanup: rename function
Rename _thin_lv_has_device_id and use common function naming with _lv_has_thin_device_id().
-rw-r--r--lib/activate/dev_manager.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/activate/dev_manager.c b/lib/activate/dev_manager.c
index 689305f7b..c4bd6ab7b 100644
--- a/lib/activate/dev_manager.c
+++ b/lib/activate/dev_manager.c
@@ -1070,7 +1070,7 @@ bad:
return r;
}
-static int _thin_lv_has_device_id(struct dm_pool *mem, const struct logical_volume *lv,
+static int _lv_has_thin_device_id(struct dm_pool *mem, const struct logical_volume *lv,
const char *layer, unsigned device_id)
{
char *dlid;
@@ -3529,7 +3529,7 @@ static int _add_new_lv_to_dtree(struct dev_manager *dm, struct dm_tree *dtree,
*/
if ((dinfo = _cached_dm_info(dm->mem, dtree, lv, NULL))) {
/* Merging origin LV is present, check if mergins is already running. */
- if ((seg_is_thin_volume(seg) && _thin_lv_has_device_id(dm->mem, lv, NULL, seg->device_id)) ||
+ if ((seg_is_thin_volume(seg) && _lv_has_thin_device_id(dm->mem, lv, NULL, seg->device_id)) ||
(!seg_is_thin_volume(seg) && lv_has_target_type(dm->mem, lv, NULL, TARGET_NAME_SNAPSHOT_MERGE))) {
log_debug_activation("Merging of snapshot volume %s to origin %s is in progress.",
display_lvname(seg->lv), display_lvname(seg->lv));