summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZdenek Kabelac <zkabelac@redhat.com>2016-12-14 11:34:28 +0100
committerZdenek Kabelac <zkabelac@redhat.com>2016-12-14 11:41:42 +0100
commit0f98d5c2e6d103a46bb5eca75ac496622933c475 (patch)
tree8bab4864a7695c549a159d2b977b46a04928c8fb
parentfecd043cca4b5f4d5a244d715c60ce35ff1b62d7 (diff)
downloadlvm2-0f98d5c2e6d103a46bb5eca75ac496622933c475.tar.gz
cleanup: use exiting function
Reuse existing code and some indent change.
-rw-r--r--lib/metadata/lv_manip.c4
-rw-r--r--lib/metadata/raid_manip.c9
2 files changed, 4 insertions, 9 deletions
diff --git a/lib/metadata/lv_manip.c b/lib/metadata/lv_manip.c
index 211b1909e..1889998e2 100644
--- a/lib/metadata/lv_manip.c
+++ b/lib/metadata/lv_manip.c
@@ -6258,12 +6258,12 @@ static int _lv_update_and_reload(struct logical_volume *lv, int origin_only)
int lv_update_and_reload(struct logical_volume *lv)
{
- return _lv_update_and_reload(lv, 0);
+ return _lv_update_and_reload(lv, 0);
}
int lv_update_and_reload_origin(struct logical_volume *lv)
{
- return _lv_update_and_reload(lv, 1);
+ return _lv_update_and_reload(lv, 1);
}
/*
diff --git a/lib/metadata/raid_manip.c b/lib/metadata/raid_manip.c
index b48b9594a..5ec86a38a 100644
--- a/lib/metadata/raid_manip.c
+++ b/lib/metadata/raid_manip.c
@@ -1464,13 +1464,8 @@ int lv_raid_split(struct logical_volume *lv, const char *split_name,
/*
* Eliminate the residual LVs
*/
- dm_list_iterate_items(lvl, &removal_lvs) {
- if (!deactivate_lv(cmd, lvl->lv))
- return_0;
-
- if (!lv_remove(lvl->lv))
- return_0;
- }
+ if (!_deactivate_and_remove_lvs(lv->vg, &removal_lvs))
+ return_0;
if (!vg_write(lv->vg) || !vg_commit(lv->vg))
return_0;