From 6a58ad88a486147f33676010a1b471b42dfb09da Mon Sep 17 00:00:00 2001 From: Nedko Arnaudov Date: Sat, 25 Dec 2010 04:36:00 +0200 Subject: [PATCH] ladishd: when interlinking on load, ignore clients of other vgraphs. Fix for #137 --- daemon/load.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/daemon/load.c b/daemon/load.c index c7f8543a..e435944e 100644 --- a/daemon/load.c +++ b/daemon/load.c @@ -299,6 +299,13 @@ interlink_client( bool interlinked; bool jmcore; + ASSERT(ctx_ptr->vgraph != NULL); + if (ctx_ptr->vgraph != ladish_client_get_vgraph(jclient)) + { + /* skip clients of different vgraphs */ + return true; + } + if (strcmp(name, "system") == 0) { return true; @@ -313,7 +320,9 @@ interlink_client( } else if (interlinked) { - ASSERT_NO_PASS; /* jclient has no app associated but is interlinked */ + /* jclient has no app associated but is interlinked */ + /* this can happen if there is an external app (presumably in a different vgraph) */ + ASSERT_NO_PASS; /* if vgraph is different, then we should have skipped the client earlier */ return true; } ASSERT(!interlinked);