Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 25 Jun 2009 20:12:27 GMT
From:      Marko Zec <zec@FreeBSD.org>
To:        Perforce Change Reviews <perforce@freebsd.org>
Subject:   PERFORCE change 165205 for review
Message-ID:  <200906252012.n5PKCR5R077794@repoman.freebsd.org>

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

Change 165205 by zec@zec_amdx4 on 2009/06/25 20:11:46

	Garbage collection.

Affected files ...

.. //depot/projects/vimage-commit2/src/sys/nfsclient/nfs_socket.c#10 edit
.. //depot/projects/vimage-commit2/src/sys/nfsclient/nfs_vfsops.c#22 edit
.. //depot/projects/vimage-commit2/src/sys/nfsclient/nfsmount.h#6 edit

Differences ...

==== //depot/projects/vimage-commit2/src/sys/nfsclient/nfs_socket.c#10 (text+ko) ====

@@ -1157,8 +1157,6 @@
 	    ((nmp->nm_tprintf_delay) - (nmp->nm_tprintf_initial_delay));
 	mrest_len = m_length(mrest, NULL);
 
-	CURVNET_SET(nmp->nm_vnet);
-
 	/*
 	 * Get the RPC header with authorization.
 	 */
@@ -1311,7 +1309,6 @@
 		m_freem(rep->r_mreq);
 		mtx_destroy(&rep->r_mtx);
 		free((caddr_t)rep, M_NFSREQ);
-		CURVNET_RESTORE();
 		return (error);
 	}
 
@@ -1331,7 +1328,6 @@
 		m_freem(rep->r_mreq);
 		mtx_destroy(&rep->r_mtx);
 		free((caddr_t)rep, M_NFSREQ);
-		CURVNET_RESTORE();
 		return (error);
 	}
 
@@ -1381,7 +1377,6 @@
 			m_freem(rep->r_mreq);
 			mtx_destroy(&rep->r_mtx);
 			free((caddr_t)rep, M_NFSREQ);
-			CURVNET_RESTORE();
 			return (error);
 		}
 
@@ -1391,7 +1386,6 @@
 		m_freem(rep->r_mreq);
 		mtx_destroy(&rep->r_mtx);
 		free((caddr_t)rep, M_NFSREQ);
-		CURVNET_RESTORE();
 		return (0);
 	}
 	m_freem(mrep);
@@ -1400,7 +1394,6 @@
 	m_freem(rep->r_mreq);
 	mtx_destroy(&rep->r_mtx);
 	free((caddr_t)rep, M_NFSREQ);
-	CURVNET_RESTORE();
 	return (error);
 }
 

==== //depot/projects/vimage-commit2/src/sys/nfsclient/nfs_vfsops.c#22 (text+ko) ====

@@ -1194,9 +1194,6 @@
 	vfs_getnewfsid(mp);
 	nmp->nm_mountp = mp;
 	mtx_init(&nmp->nm_mtx, "NFSmount lock", NULL, MTX_DEF);			
-#ifdef VIMAGE
-	nmp->nm_vnet = CRED_TO_VNET(cred);
-#endif
 
 	/*
 	 * V2 can only handle 32 bit filesizes.  A 4GB-1 limit may be too

==== //depot/projects/vimage-commit2/src/sys/nfsclient/nfsmount.h#6 (text+ko) ====

@@ -131,9 +131,6 @@
 	fsid_t	nm_fsid;
 	u_int	nm_lease_time;
 	time_t	nm_last_renewal;
-
-	/* VIMAGE */
-	struct vnet *nm_vnet;		/* vnet this mount was created in */
 };
 
 #if defined(_KERNEL)



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