From owner-p4-projects@FreeBSD.ORG  Wed Mar  3 18:11:18 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 4927F16A4D0; Wed,  3 Mar 2004 18:11:18 -0800 (PST)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 242BC16A4CE
	for <perforce@freebsd.org>; Wed,  3 Mar 2004 18:11:18 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 1EAC843D1F
	for <perforce@freebsd.org>; Wed,  3 Mar 2004 18:11:18 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i242BHGe056821
	for <perforce@freebsd.org>; Wed, 3 Mar 2004 18:11:17 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i242BH8j056815
	for perforce@freebsd.org; Wed, 3 Mar 2004 18:11:17 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Wed, 3 Mar 2004 18:11:17 -0800 (PST)
Message-Id: <200403040211.i242BH8j056815@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 48093 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 04 Mar 2004 02:11:18 -0000

http://perforce.freebsd.org/chv.cgi?CH=48093

Change 48093 by rwatson@rwatson_tislabs on 2004/03/03 18:10:19

	Integrate return path cleanup in socket().

Affected files ...

.. //depot/projects/netperf_socket/sys/kern/uipc_syscalls.c#3 integrate

Differences ...

==== //depot/projects/netperf_socket/sys/kern/uipc_syscalls.c#3 (text+ko) ====

@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/uipc_syscalls.c,v 1.173 2004/02/08 07:35:48 silby Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/uipc_syscalls.c,v 1.174 2004/03/04 01:57:48 rwatson Exp $");
 
 #include "opt_compat.h"
 #include "opt_ktrace.h"
@@ -115,7 +115,7 @@
 	fdp = td->td_proc->p_fd;
 	error = falloc(td, &fp, &fd);
 	if (error)
-		goto done2;
+		return (error);
 	/* An extra reference on `fp' has been held for us by falloc(). */
 	mtx_lock(&Giant);
 	error = socreate(uap->domain, &so, uap->type, uap->protocol,
@@ -140,7 +140,6 @@
 		td->td_retval[0] = fd;
 	}
 	fdrop(fp, td);
-done2:
 	return (error);
 }