From 567aa60fa1aa1779d0f30c9ff2ad9c4fafec3d23 Mon Sep 17 00:00:00 2001 From: Zdenek Kabelac Date: Sun, 16 Jul 2017 22:28:50 +0200 Subject: [PATCH] lvmetad: cleanup Avoid hashing insertion when object with same content is already there. --- daemons/lvmetad/lvmetad-core.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/daemons/lvmetad/lvmetad-core.c b/daemons/lvmetad/lvmetad-core.c index 64d4fbbe8..6d5f6a77c 100644 --- a/daemons/lvmetad/lvmetad-core.c +++ b/daemons/lvmetad/lvmetad-core.c @@ -808,7 +808,8 @@ static int _update_pvid_to_vgid(lvmetad_state *s, struct dm_config_tree *vg, if ((mode == REMOVE_EMPTY) && vgid_old) { /* This copies the vgid_old string, doesn't reference it. */ - if (!dm_hash_insert(to_check, vgid_old, (void*) 1)) { + if ((dm_hash_lookup(to_check, vgid_old) != (void*) 1) && + !dm_hash_insert(to_check, vgid_old, (void*) 1)) { ERROR(s, "update_pvid_to_vgid out of memory for hash insert vgid_old %s", vgid_old); goto abort_daemon; }