From 0f98d5c2e6d103a46bb5eca75ac496622933c475 Mon Sep 17 00:00:00 2001 From: Zdenek Kabelac Date: Wed, 14 Dec 2016 11:34:28 +0100 Subject: [PATCH] cleanup: use exiting function Reuse existing code and some indent change. --- lib/metadata/lv_manip.c | 4 ++-- lib/metadata/raid_manip.c | 9 ++------- 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; -- 2.43.5