Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 2 May 2009 10:22:10 GMT
From:      Marko Zec <zec@FreeBSD.org>
To:        Perforce Change Reviews <perforce@freebsd.org>
Subject:   PERFORCE change 161470 for review
Message-ID:  <200905021022.n42AMAcv029538@repoman.freebsd.org>

next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=161470

Change 161470 by zec@zec_tpx32 on 2009/05/02 10:22:09

	Reduce controversy by not throwing CURVNET_SET() / RESTORE()
	macros at NFS code, which is already known to be disfunctional
	with options VIMAGE builds.  This will probably be reintroduced
	later in an integral NFS + VIMAGE fix.

Affected files ...

.. //depot/projects/vimage-commit2/src/sys/kern/vfs_export.c#8 edit

Differences ...

==== //depot/projects/vimage-commit2/src/sys/kern/vfs_export.c#8 (text+ko) ====

@@ -51,7 +51,6 @@
 #include <sys/socket.h>
 #include <sys/systm.h>
 #include <sys/vnode.h>
-#include <sys/vimage.h>
 
 #include <net/radix.h>
 
@@ -142,7 +141,6 @@
 	}
 #endif
 
-	CURVNET_SET(TD_TO_VNET(curthread)); /* XXX MARKO */
 	i = sizeof(struct netcred) + argp->ex_addrlen + argp->ex_masklen;
 	np = (struct netcred *) malloc(i, M_NETADDR, M_WAITOK | M_ZERO);
 	saddr = (struct sockaddr *) (np + 1);
@@ -215,10 +213,8 @@
 	bcopy(argp->ex_secflavors, np->netc_secflavors,
 	    sizeof(np->netc_secflavors));
 	refcount_init(&np->netc_anon.cr_ref, 1);
-	CURVNET_RESTORE();
 	return (0);
 out:
-	CURVNET_RESTORE();
 	free(np, M_NETADDR);
 	return (error);
 }



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