From 034bd1e69561dbb62c23417a5dc19440bba806b3 Mon Sep 17 00:00:00 2001 From: pjd Date: Sat, 16 Sep 2006 09:26:57 +0000 Subject: First kill detached providers, because of two reasons: - after killing all attached providers, all providers are then detached and operation is repeated for those who were attached, - we don't want to remove keys for read-only attached providers, we only want to detach them. MFC after: 1 week --- sbin/geom/class/eli/geom_eli.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'sbin/geom/class') diff --git a/sbin/geom/class/eli/geom_eli.c b/sbin/geom/class/eli/geom_eli.c index d9543ae..3da4e83 100644 --- a/sbin/geom/class/eli/geom_eli.c +++ b/sbin/geom/class/eli/geom_eli.c @@ -926,18 +926,14 @@ eli_kill(struct gctl_req *req) * geli kill da0 da1 */ - /* - * First attached providers. - */ - gctl_issue(req); - /* - * Now the rest. - */ + /* First detached provider. */ for (i = 0; i < nargs; i++) { prov = gctl_get_ascii(req, "arg%d", i); if (!eli_is_attached(prov)) eli_kill_detached(req, prov); } + /* Now attached providers. */ + gctl_issue(req); } static void -- cgit v1.1