Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 3 Mar 2004 18:11:17 -0800 (PST)
From:      Robert Watson <rwatson@FreeBSD.org>
To:        Perforce Change Reviews <perforce@freebsd.org>
Subject:   PERFORCE change 48093 for review
Message-ID:  <200403040211.i242BH8j056815@repoman.freebsd.org>

next in thread | raw e-mail | index | archive | help
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);
 }
 



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