diff options
| author | Petr Rockai <prockai@redhat.com> | 2015-04-23 01:39:39 +0200 |
|---|---|---|
| committer | Petr Rockai <me@mornfall.net> | 2015-04-28 17:25:06 +0200 |
| commit | 4aaffe0650f88d63cf469b23c2e8a28a8c56b5cc (patch) | |
| tree | e4848bf6e01740b4a8ddfd1b3f9e0fa2b47db370 | |
| parent | d0c46c9ed5247732e46fcb9ca4ad5be9f77a64a0 (diff) | |
| download | lvm2-dev-mornfall-duplicate-pvs.tar.gz | |
lvmetad: Avoid duplicate entries in the list of alternate devices.dev-mornfall-duplicate-pvs
| -rw-r--r-- | daemons/lvmetad/lvmetad-core.c | 29 |
1 files changed, 23 insertions, 6 deletions
diff --git a/daemons/lvmetad/lvmetad-core.c b/daemons/lvmetad/lvmetad-core.c index 1a2ce44f2..9ba22c7c8 100644 --- a/daemons/lvmetad/lvmetad-core.c +++ b/daemons/lvmetad/lvmetad-core.c @@ -936,12 +936,29 @@ static response pv_found(lvmetad_state *s, request r) altdev = dm_config_clone_node(cft, altdev, 0); chain_node(altdev, cft->root, 0); } else - altdev = make_config_node(cft, "devices_alternate", cft->root, 0); - if (!altdev || !(altdev_v = dm_config_create_value(cft))) - goto out_of_mem; - altdev_v->next = altdev->v; - altdev->v = altdev_v; - altdev->v->v.i = device_old_pvid; + if (!(altdev = make_config_node(cft, "devices_alternate", cft->root, 0))) + goto out_of_mem; + altdev_v = altdev->v; + while (1) { + if (altdev_v && altdev_v->v.i == device_old_pvid) + break; + if (altdev_v) + altdev_v = altdev_v->next; + if (!altdev_v) { + if (!(altdev_v = dm_config_create_value(cft))) + goto out_of_mem; + altdev_v->next = altdev->v; + altdev->v = altdev_v; + altdev->v->v.i = device_old_pvid; + break; + } + }; + altdev_v = altdev->v; + while (altdev_v) { + if (altdev_v->next && altdev_v->next->v.i == device) + altdev_v->next = altdev_v->next->next; + altdev_v = altdev_v->next; + } changed |= 1; } |