Date: Thu, 25 Jun 2009 20:05:20 GMT From: Marko Zec <zec@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 165204 for review Message-ID: <200906252005.n5PK5K0T077318@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=165204 Change 165204 by zec@zec_amdx4 on 2009/06/25 20:05:15 Reduce diff against head. Affected files ... .. //depot/projects/vimage-commit2/src/sys/kern/uipc_socket.c#27 edit .. //depot/projects/vimage-commit2/src/sys/kern/vfs_export.c#12 edit Differences ... ==== //depot/projects/vimage-commit2/src/sys/kern/uipc_socket.c#27 (text+ko) ==== @@ -285,9 +285,6 @@ so->so_gencnt = ++so_gencnt; ++numopensockets; #ifdef VIMAGE - KASSERT(vnet != NULL, ("soalloc(): NULL vnet")); - KASSERT(vnet->vnet_magic_n == VNET_MAGIC_N, - ("soalloc(): invalid vnet: %p", vnet)); ++vnet->sockcnt; /* Locked with so_global_mtx. */ so->so_vnet = vnet; #endif ==== //depot/projects/vimage-commit2/src/sys/kern/vfs_export.c#12 (text+ko) ==== @@ -81,7 +81,6 @@ struct netexport { struct netcred ne_defexported; /* Default export */ struct radix_node_head *ne_rtable[AF_MAX+1]; /* Individual exports */ - struct vnet *ne_vnet; /* vnet for this export */ }; /* @@ -142,7 +141,7 @@ } #endif - CURVNET_SET(nep->ne_vnet); + CURVNET_SET(TD_TO_VNET(curthread)); /* XXX revisit */ 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); @@ -284,7 +283,6 @@ MNT_IUNLOCK(mp); } vfs_free_addrlist(nep); - /* XXX TODO: unref nep->ne_vnet */ mp->mnt_export = NULL; free(nep, M_MOUNT); nep = NULL; @@ -296,8 +294,6 @@ if (nep == NULL) { nep = malloc(sizeof(struct netexport), M_MOUNT, M_WAITOK | M_ZERO); mp->mnt_export = nep; - nep->ne_vnet = TD_TO_VNET(curthread); - /* XXX TODO: ref nep->ne_vnet */ } if (argp->ex_flags & MNT_EXPUBLIC) { if ((error = vfs_setpublicfs(mp, nep, argp)) != 0)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200906252005.n5PK5K0T077318>