Remove lvs_in_vg_activated_by_uuid_only call.

There is no difference from lvs_in_vg_activated now,
convert all users to this call.

diff --git a/WHATS_NEW b/WHATS_NEW
index 2aba0ae2b472bc09047fdca9a82442391fb52a3d..103aa6b275405db960995b6b939d8906f2da00ef 100644 (file)
--- a/WHATS_NEW
+++ b/WHATS_NEW
@@ -1,5 +1,6 @@
 Version 2.02.62 -
 ====================================
+  Remove lvs_in_vg_activated_by_uuid_only call.
   Run device info query device by uuid only.
   Don't touch /dev in vgmknodes if activation is disabled.
   Update lvm2app.h Doxygen comments and add lvm2app Doxygen config file.

diff --git a/lib/activate/activate.c b/lib/activate/activate.c
index f53b94e3be06c96ed489173d1abbaaee59e6ca31..c0ffd5371a24104971b3f393f795c19bf619f57d 100644 (file)
--- a/lib/activate/activate.c
+++ b/lib/activate/activate.c
@@ -171,10 +171,6 @@ int lvs_in_vg_activated(struct volume_group *vg)
 {
        return 0;
 }
-int lvs_in_vg_activated_by_uuid_only(struct volume_group *vg)
-{
-       return 0;
-}
 int lvs_in_vg_opened(struct volume_group *vg)
 {
        return 0;
@@ -627,7 +623,7 @@ static int _lv_suspend_lv(struct logical_volume *lv, int lockfs, int flush_requi
  * These two functions return the number of visible LVs in the state,
  * or -1 on error.
  */
-static int _lvs_in_vg_activated(struct volume_group *vg, unsigned by_uuid_only)
+int lvs_in_vg_activated(struct volume_group *vg)
 {
        struct lv_list *lvl;
        int count = 0;
@@ -643,16 +639,6 @@ static int _lvs_in_vg_activated(struct volume_group *vg, unsigned by_uuid_only)
        return count;
 }
 
-int lvs_in_vg_activated_by_uuid_only(struct volume_group *vg)
-{
-       return _lvs_in_vg_activated(vg, 1);
-}
-
-int lvs_in_vg_activated(struct volume_group *vg)
-{
-       return _lvs_in_vg_activated(vg, 0);
-}
-
 int lvs_in_vg_opened(const struct volume_group *vg)
 {
        const struct lv_list *lvl;

diff --git a/lib/activate/activate.h b/lib/activate/activate.h
index ba70372d1e08d9a3c5dc792abca16cd6a43ebf93..32d9a5cf8232b7191bf4d2ab5dcd30a9c56ab1cc 100644 (file)
--- a/lib/activate/activate.h
+++ b/lib/activate/activate.h
@@ -91,7 +91,6 @@ int lv_mirror_percent(struct cmd_context *cmd, struct logical_volume *lv,
  * Return number of LVs in the VG that are active.
  */
 int lvs_in_vg_activated(struct volume_group *vg);
-int lvs_in_vg_activated_by_uuid_only(struct volume_group *vg);
 int lvs_in_vg_opened(const struct volume_group *vg);
 
 int lv_is_active(struct logical_volume *lv);

diff --git a/tools/vgrename.c b/tools/vgrename.c
index faf20bca3dc79713daf1587484b7a0e439f63014..a63a6266ad57908de81865dbf9531a21bc15a182 100644 (file)
--- a/tools/vgrename.c
+++ b/tools/vgrename.c
@@ -29,7 +29,7 @@ static struct volume_group *vg_rename_old(struct cmd_context *cmd,
                return_NULL;
        }
 
-       if (lvs_in_vg_activated_by_uuid_only(vg)) {
+       if (lvs_in_vg_activated(vg)) {
                unlock_and_release_vg(cmd, vg, vg_name_old);
                log_error("Volume group \"%s\" still has active LVs",
                          vg_name_old);
@@ -161,7 +161,7 @@ static int vg_rename_path(struct cmd_context *cmd, const char *old_vg_path,
                if (test_mode())
                        log_verbose("Test mode: Skipping rename.");
 
-               else if (lvs_in_vg_activated_by_uuid_only(vg)) {
+               else if (lvs_in_vg_activated(vg)) {
                        if (!vg_refresh_visible(cmd, vg)) {
                                log_error("Renaming \"%s\" to \"%s\" failed", 
                                        old_path, new_path);