From owner-p4-projects@FreeBSD.ORG  Fri Jun 26 14:13:10 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 81ACC1065672; Fri, 26 Jun 2009 14:13:10 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 4135C106566C
	for <perforce@freebsd.org>; Fri, 26 Jun 2009 14:13:10 +0000 (UTC)
	(envelope-from zec@fer.hr)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 2FABD8FC0C
	for <perforce@freebsd.org>; Fri, 26 Jun 2009 14:13:10 +0000 (UTC)
	(envelope-from zec@fer.hr)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n5QEDARo023015
	for <perforce@freebsd.org>; Fri, 26 Jun 2009 14:13:10 GMT
	(envelope-from zec@fer.hr)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n5QED9j7023013
	for perforce@freebsd.org; Fri, 26 Jun 2009 14:13:09 GMT
	(envelope-from zec@fer.hr)
Date: Fri, 26 Jun 2009 14:13:09 GMT
Message-Id: <200906261413.n5QED9j7023013@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	zec@fer.hr using -f
From: Marko Zec <zec@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 165251 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
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: Fri, 26 Jun 2009 14:13:11 -0000

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

Change 165251 by zec@zec_amdx4 on 2009/06/26 14:13:00

	Allow for rpc.statd and rpc.lockd to be started, but
	without doing any functional testing.  Introduce a lot
	curvnet recursions triggered by the above daemons that
	have to be looked into and resolved.

Affected files ...

.. //depot/projects/vimage-commit2/src/sys/rpc/clnt_dg.c#6 edit
.. //depot/projects/vimage-commit2/src/sys/rpc/svc_dg.c#4 edit

Differences ...

==== //depot/projects/vimage-commit2/src/sys/rpc/clnt_dg.c#6 (text+ko) ====

@@ -56,6 +56,7 @@
 #include <sys/socketvar.h>
 #include <sys/time.h>
 #include <sys/uio.h>
+#include <sys/vimage.h>
 
 #include <rpc/rpc.h>
 #include <rpc/rpc_com.h>
@@ -197,11 +198,14 @@
 		return (NULL);
 	}
 
+	CURVNET_SET(so->so_vnet);
 	if (!__rpc_socket2sockinfo(so, &si)) {
 		rpc_createerr.cf_stat = RPC_TLIERROR;
 		rpc_createerr.cf_error.re_errno = 0;
+		CURVNET_RESTORE();
 		return (NULL);
 	}
+	CURVNET_RESTORE();
 
 	/*
 	 * Find the receive and the send size

==== //depot/projects/vimage-commit2/src/sys/rpc/svc_dg.c#4 (text+ko) ====

@@ -56,6 +56,7 @@
 #include <sys/sx.h>
 #include <sys/systm.h>
 #include <sys/uio.h>
+#include <sys/vimage.h>
 
 #include <rpc/rpc.h>
 
@@ -101,8 +102,10 @@
 	struct sockaddr* sa;
 	int error;
 
+	CURVNET_SET(so->so_vnet);
 	if (!__rpc_socket2sockinfo(so, &si)) {
 		printf(svc_dg_str, svc_dg_err1);
+		CURVNET_RESTORE();
 		return (NULL);
 	}
 	/*
@@ -112,6 +115,7 @@
 	recvsize = __rpc_get_t_size(si.si_af, si.si_proto, (int)recvsize);
 	if ((sendsize == 0) || (recvsize == 0)) {
 		printf(svc_dg_str, svc_dg_err2);
+		CURVNET_RESTORE();
 		return (NULL);
 	}
 
@@ -142,6 +146,7 @@
 	if (xprt) {
 		svc_xprt_free(xprt);
 	}
+	CURVNET_RESTORE();
 	return (NULL);
 }