From owner-p4-projects@FreeBSD.ORG Thu Jun 25 20:12:28 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A7B561065673; Thu, 25 Jun 2009 20:12:28 +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 31FEA106564A for ; Thu, 25 Jun 2009 20:12:28 +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 209BA8FC14 for ; Thu, 25 Jun 2009 20:12:28 +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 n5PKCSU6077796 for ; Thu, 25 Jun 2009 20:12:28 GMT (envelope-from zec@fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n5PKCR5R077794 for perforce@freebsd.org; Thu, 25 Jun 2009 20:12:27 GMT (envelope-from zec@fer.hr) Date: Thu, 25 Jun 2009 20:12:27 GMT Message-Id: <200906252012.n5PKCR5R077794@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 165205 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 25 Jun 2009 20:12:29 -0000 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)