From owner-svn-src-stable-8@FreeBSD.ORG Thu Apr 7 05:58:22 2011 Return-Path: Delivered-To: svn-src-stable-8@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 18F3D106566B; Thu, 7 Apr 2011 05:58:22 +0000 (UTC) (envelope-from ae@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id E24938FC18; Thu, 7 Apr 2011 05:58:21 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p375wLfJ030246; Thu, 7 Apr 2011 05:58:21 GMT (envelope-from ae@svn.freebsd.org) Received: (from ae@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p375wLVc030244; Thu, 7 Apr 2011 05:58:21 GMT (envelope-from ae@svn.freebsd.org) Message-Id: <201104070558.p375wLVc030244@svn.freebsd.org> From: "Andrey V. Elsukov" Date: Thu, 7 Apr 2011 05:58:21 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r220407 - stable/8/sys/geom/nop X-BeenThere: svn-src-stable-8@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 8-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 07 Apr 2011 05:58:22 -0000 Author: ae Date: Thu Apr 7 05:58:21 2011 New Revision: 220407 URL: http://svn.freebsd.org/changeset/base/220407 Log: MFC r220184: Remove unneeded checks, g_new_xxx functions can not return NULL. Modified: stable/8/sys/geom/nop/g_nop.c Directory Properties: stable/8/sys/ (props changed) stable/8/sys/amd64/include/xen/ (props changed) stable/8/sys/cddl/contrib/opensolaris/ (props changed) stable/8/sys/contrib/dev/acpica/ (props changed) stable/8/sys/contrib/pf/ (props changed) Modified: stable/8/sys/geom/nop/g_nop.c ============================================================================== --- stable/8/sys/geom/nop/g_nop.c Thu Apr 7 03:19:10 2011 (r220406) +++ stable/8/sys/geom/nop/g_nop.c Thu Apr 7 05:58:21 2011 (r220407) @@ -189,10 +189,6 @@ g_nop_create(struct gctl_req *req, struc } } gp = g_new_geomf(mp, name); - if (gp == NULL) { - gctl_error(req, "Cannot create geom %s.", name); - return (ENOMEM); - } sc = g_malloc(sizeof(*sc), M_WAITOK); sc->sc_offset = offset; sc->sc_error = ioerror; @@ -209,20 +205,10 @@ g_nop_create(struct gctl_req *req, struc gp->dumpconf = g_nop_dumpconf; newpp = g_new_providerf(gp, gp->name); - if (newpp == NULL) { - gctl_error(req, "Cannot create provider %s.", name); - error = ENOMEM; - goto fail; - } newpp->mediasize = size; newpp->sectorsize = secsize; cp = g_new_consumer(gp); - if (cp == NULL) { - gctl_error(req, "Cannot create consumer for %s.", gp->name); - error = ENOMEM; - goto fail; - } error = g_attach(cp, pp); if (error != 0) { gctl_error(req, "Cannot attach to provider %s.", pp->name); @@ -233,18 +219,12 @@ g_nop_create(struct gctl_req *req, struc G_NOP_DEBUG(0, "Device %s created.", gp->name); return (0); fail: - if (cp != NULL) { - if (cp->provider != NULL) - g_detach(cp); - g_destroy_consumer(cp); - } - if (newpp != NULL) - g_destroy_provider(newpp); - if (gp != NULL) { - if (gp->softc != NULL) - g_free(gp->softc); - g_destroy_geom(gp); - } + if (cp->provider != NULL) + g_detach(cp); + g_destroy_consumer(cp); + g_destroy_provider(newpp); + g_free(gp->softc); + g_destroy_geom(gp); return (error); }