From owner-svn-src-all@FreeBSD.ORG Sat Jan 24 18:23:19 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 A8B85106566B; Sat, 24 Jan 2009 18:23:19 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 7D4528FC25; Sat, 24 Jan 2009 18:23:19 +0000 (UTC) (envelope-from ed@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 n0OINJjo095336; Sat, 24 Jan 2009 18:23:19 GMT (envelope-from ed@svn.freebsd.org) Received: (from ed@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n0OINJAD095335; Sat, 24 Jan 2009 18:23:19 GMT (envelope-from ed@svn.freebsd.org) Message-Id: <200901241823.n0OINJAD095335@svn.freebsd.org> From: Ed Schouten Date: Sat, 24 Jan 2009 18:23:19 +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: r187672 - head/sys/geom 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: Sat, 24 Jan 2009 18:23:20 -0000 Author: ed Date: Sat Jan 24 18:23:19 2009 New Revision: 187672 URL: http://svn.freebsd.org/changeset/base/187672 Log: Remove unused unrhdr from GEOM character device module. Now that make_dev() doesn't require unit numbers to be unique, there is no need to use an unrhdr here to generate the numbers. Remove the entire init-routine, because it is optional. Modified: head/sys/geom/geom_dev.c Modified: head/sys/geom/geom_dev.c ============================================================================== --- head/sys/geom/geom_dev.c Sat Jan 24 18:20:15 2009 (r187671) +++ head/sys/geom/geom_dev.c Sat Jan 24 18:23:19 2009 (r187672) @@ -72,25 +72,14 @@ static struct cdevsw g_dev_cdevsw = { static g_taste_t g_dev_taste; static g_orphan_t g_dev_orphan; -static g_init_t g_dev_init; static struct g_class g_dev_class = { .name = "DEV", .version = G_VERSION, .taste = g_dev_taste, .orphan = g_dev_orphan, - .init = g_dev_init, }; -static struct unrhdr *unithdr; /* Locked by topology */ - -static void -g_dev_init(struct g_class *mp) -{ - - unithdr = new_unrhdr(0, INT_MAX, NULL); -} - void g_dev_print(void) { @@ -126,7 +115,6 @@ g_dev_taste(struct g_class *mp, struct g struct g_consumer *cp; int error; struct cdev *dev; - u_int unit; g_trace(G_T_TOPOLOGY, "dev_taste(%s,%s)", mp->name, pp->name); g_topology_assert(); @@ -138,8 +126,7 @@ g_dev_taste(struct g_class *mp, struct g error = g_attach(cp, pp); KASSERT(error == 0, ("g_dev_taste(%s) failed to g_attach, err=%d", pp->name, error)); - unit = alloc_unr(unithdr); - dev = make_dev(&g_dev_cdevsw, unit, + dev = make_dev(&g_dev_cdevsw, 0, UID_ROOT, GID_OPERATOR, 0640, gp->name); if (pp->flags & G_PF_CANDELETE) dev->si_flags |= SI_CANDELETE; @@ -432,7 +419,6 @@ g_dev_orphan(struct g_consumer *cp) { struct g_geom *gp; struct cdev *dev; - u_int unit; g_topology_assert(); gp = cp->geom; @@ -444,9 +430,7 @@ g_dev_orphan(struct g_consumer *cp) set_dumper(NULL); /* Destroy the struct cdev *so we get no more requests */ - unit = dev2unit(dev); destroy_dev(dev); - free_unr(unithdr, unit); /* Wait for the cows to come home */ while (cp->nstart != cp->nend)