From owner-svn-src-all@FreeBSD.ORG Wed May 6 19:06:28 2009 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7AB32106566B; Wed, 6 May 2009 19:06:28 +0000 (UTC) (envelope-from lulf@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 699668FC08; Wed, 6 May 2009 19:06:28 +0000 (UTC) (envelope-from lulf@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n46J6SaW026984; Wed, 6 May 2009 19:06:28 GMT (envelope-from lulf@svn.freebsd.org) Received: (from lulf@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n46J6Sfb026983; Wed, 6 May 2009 19:06:28 GMT (envelope-from lulf@svn.freebsd.org) Message-Id: <200905061906.n46J6Sfb026983@svn.freebsd.org> From: Ulf Lilleengen Date: Wed, 6 May 2009 19:06:28 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r191854 - head/sys/geom/vinum X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 06 May 2009 19:06:28 -0000 Author: lulf Date: Wed May 6 19:06:28 2009 New Revision: 191854 URL: http://svn.freebsd.org/changeset/base/191854 Log: - Check if any plexes are doing internal maintenance before removing them. Modified: head/sys/geom/vinum/geom_vinum_rm.c Modified: head/sys/geom/vinum/geom_vinum_rm.c ============================================================================== --- head/sys/geom/vinum/geom_vinum_rm.c Wed May 6 18:37:32 2009 (r191853) +++ head/sys/geom/vinum/geom_vinum_rm.c Wed May 6 19:06:28 2009 (r191854) @@ -172,6 +172,13 @@ gv_resetconfig(struct gv_softc *sc) return (GV_ERR_ISBUSY); } } + + /* Make sure nothing is going on internally. */ + LIST_FOREACH_SAFE(p, &sc->plexes, plex, p2) { + if (p->flags & (GV_PLEX_REBUILDING | GV_PLEX_GROWING)) + return (GV_ERR_ISBUSY); + } + /* Then if not, we remove everything. */ LIST_FOREACH_SAFE(s, &sc->subdisks, sd, s2) gv_rm_sd(sc, s);