Skip site navigation (1)Skip section navigation (2) 
Date:      Thu, 11 Nov 2010 12:13:41 +0000 (UTC)
From:      "Andrey V. Elsukov" <ae@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r215118 - head/sys/geom/part
Message-ID:  <201011111213.oABCDfXf066983@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: ae
Date: Thu Nov 11 12:13:41 2010
New Revision: 215118
URL: http://svn.freebsd.org/changeset/base/215118

Log:
  Fix regression introduced in r215088: gpart(8) reports
  "arg0 'provider': Invalid argument" after creating new partition
  table.
  Move code for search of existing geom into g_part_find_geom
  function and use this function instead of g_part_parm_geom
  in g_part_ctl_create.
  
  Approved by:	kib (mentor)

Modified:
  head/sys/geom/part/g_part.c

Modified: head/sys/geom/part/g_part.c
==============================================================================
--- head/sys/geom/part/g_part.c	Thu Nov 11 11:54:01 2010	(r215117)
+++ head/sys/geom/part/g_part.c	Thu Nov 11 12:13:41 2010	(r215118)
@@ -296,6 +296,17 @@ g_part_new_provider(struct g_geom *gp, s
 	g_error_provider(entry->gpe_pp, 0);
 }
 
+static struct g_geom*
+g_part_find_geom(const char *name)
+{
+	struct g_geom *gp;
+	LIST_FOREACH(gp, &g_part_class.geom, geom) {
+		if (!strcmp(name, gp->name))
+			break;
+	}
+	return (gp);
+}
+
 static int
 g_part_parm_geom(struct gctl_req *req, const char *name, struct g_geom **v)
 {
@@ -307,10 +318,7 @@ g_part_parm_geom(struct gctl_req *req, c
 		return (ENOATTR);
 	if (strncmp(gname, _PATH_DEV, sizeof(_PATH_DEV) - 1) == 0)
 		gname += sizeof(_PATH_DEV) - 1;
-	LIST_FOREACH(gp, &g_part_class.geom, geom) {
-		if (!strcmp(gname, gp->name))
-			break;
-	}
+	gp = g_part_find_geom(gname);
 	if (gp == NULL) {
 		gctl_error(req, "%d %s '%s'", EINVAL, name, gname);
 		return (EINVAL);
@@ -748,8 +756,8 @@ g_part_ctl_create(struct gctl_req *req, 
 	g_topology_assert();
 
 	/* Check that there isn't already a g_part geom on the provider. */
-	error = g_part_parm_geom(req, "arg0", &gp);
-	if (!error) {
+	gp = g_part_find_geom(pp->name);
+	if (gp != NULL) {
 		null = gp->softc;
 		if (null->gpt_scheme != &g_part_null_scheme) {
 			gctl_error(req, "%d geom '%s'", EEXIST, pp->name);

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201011111213.oABCDfXf066983>