Date: Wed, 18 May 2011 16:28:28 +0000 (UTC) From: "Andrey V. Elsukov" <ae@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org Subject: svn commit: r222067 - stable/7/sys/geom/label Message-ID: <201105181628.p4IGSSl1099556@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ae Date: Wed May 18 16:28:28 2011 New Revision: 222067 URL: http://svn.freebsd.org/changeset/base/222067 Log: MFC r221433: When checking existence of providers skip those which are orphaned. PR: kern/132273 Modified: stable/7/sys/geom/label/g_label.c Directory Properties: stable/7/sys/ (props changed) stable/7/sys/cddl/contrib/opensolaris/ (props changed) stable/7/sys/contrib/dev/acpica/ (props changed) stable/7/sys/contrib/pf/ (props changed) Modified: stable/7/sys/geom/label/g_label.c ============================================================================== --- stable/7/sys/geom/label/g_label.c Wed May 18 16:20:28 2011 (r222066) +++ stable/7/sys/geom/label/g_label.c Wed May 18 16:28:28 2011 (r222067) @@ -161,6 +161,8 @@ g_label_create(struct gctl_req *req, str pp2 = LIST_FIRST(&gp->provider); if (pp2 == NULL) continue; + if ((pp2->flags & G_PF_ORPHAN) != 0) + continue; if (strcmp(pp2->name, name) == 0) { G_LABEL_DEBUG(1, "Label %s(%s) already exists (%s).", label, name, pp->name);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201105181628.p4IGSSl1099556>