From: Jonathan Earl Brassow Date: Wed, 27 Jan 2010 22:28:05 +0000 (+0000) Subject: Was using dm_list_iterate_items when I should have been using X-Git-Tag: old-v2_02_61~35 X-Git-Url: https://sourceware.org/git/?a=commitdiff_plain;h=5584f2ae4621b03dc890c6e1a9028eb8add259a1;p=lvm2.git Was using dm_list_iterate_items when I should have been using *_safe. This had the effect of segfaulting the log daemon when converting a mirror from one log type to another. Signed-off-by: Jonathan Brassow --- diff --git a/WHATS_NEW b/WHATS_NEW index af4c5ec22..cbe936ca6 100644 --- a/WHATS_NEW +++ b/WHATS_NEW @@ -1,5 +1,6 @@ Version 2.02.60 - 23rd January 2010 =================================== + Fix lvconvert issue with cluster mirrors due to un'_safe' list processing Fix pvmove abort workaround to be cluster-aware when temporary mirror activation fails. Always query device by using uuid only and not name in clvmd. Add missing metadata reverts in pvmove error path. diff --git a/daemons/cmirrord/cluster.c b/daemons/cmirrord/cluster.c index a77a11f22..c26692713 100644 --- a/daemons/cmirrord/cluster.c +++ b/daemons/cmirrord/cluster.c @@ -858,9 +858,9 @@ static int resend_requests(struct clog_cpg *entry) static int do_cluster_work(void *data __attribute((unused))) { int r = SA_AIS_OK; - struct clog_cpg *entry; + struct clog_cpg *entry, *tmp; - dm_list_iterate_items(entry, &clog_cpg_list) { + dm_list_iterate_items_safe(entry, tmp, &clog_cpg_list) { r = cpg_dispatch(entry->handle, CPG_DISPATCH_ALL); if (r != SA_AIS_OK) LOG_ERROR("cpg_dispatch failed: %s", str_ais_error(r));