Date: Wed, 4 Mar 2009 13:43:31 GMT From: Marko Zec <zec@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 158670 for review Message-ID: <200903041343.n24DhVYf001807@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=158670 Change 158670 by zec@zec_amdx2 on 2009/03/04 13:43:09 Nuke V_ripcb_zone - it was / is shadowed already by V_ripcbinfo.ipi_zone Affected files ... .. //depot/projects/vimage/src/sys/netinet/raw_ip.c#42 edit .. //depot/projects/vimage/src/sys/netinet/vinet.h#49 edit Differences ... ==== //depot/projects/vimage/src/sys/netinet/raw_ip.c#42 (text+ko) ==== @@ -83,7 +83,6 @@ #ifdef VIMAGE_GLOBALS struct inpcbhead ripcb; struct inpcbinfo ripcbinfo; -static struct uma_zone *ripcb_zone; #endif /* control hooks for ipfw and dummynet */ @@ -186,10 +185,6 @@ { INIT_VNET_INET(curvnet); - V_ripcb_zone = uma_zcreate("ripcb", sizeof(struct inpcb), - NULL, NULL, rip_inpcb_init, NULL, UMA_ALIGN_PTR, UMA_ZONE_NOFREE); - V_ripcbinfo.ipi_vnet = curvnet; - INP_INFO_LOCK_INIT(&V_ripcbinfo, "rip"); LIST_INIT(&V_ripcb); V_ripcbinfo.ipi_listhead = &V_ripcb; @@ -197,7 +192,9 @@ hashinit(INP_PCBHASH_RAW_SIZE, M_PCB, &V_ripcbinfo.ipi_hashmask); V_ripcbinfo.ipi_porthashbase = hashinit(1, M_PCB, &V_ripcbinfo.ipi_porthashmask); - V_ripcbinfo.ipi_zone = V_ripcb_zone; + V_ripcbinfo.ipi_zone = uma_zcreate("ripcb", sizeof(struct inpcb), + NULL, NULL, rip_inpcb_init, NULL, UMA_ALIGN_PTR, UMA_ZONE_NOFREE); + V_ripcbinfo.ipi_vnet = curvnet; uma_zone_set_max(V_ripcbinfo.ipi_zone, maxsockets); EVENTHANDLER_REGISTER(maxsockets_change, rip_zone_change, NULL, EVENTHANDLER_PRI_ANY); ==== //depot/projects/vimage/src/sys/netinet/vinet.h#49 (text+ko) ==== @@ -156,7 +156,6 @@ struct inpcbhead _ripcb; struct inpcbinfo _ripcbinfo; - struct uma_zone *_ripcb_zone; struct socket *_ip_mrouter; struct socket *_ip_rsvpd; @@ -288,7 +287,6 @@ #define V_reply_src VNET_INET(reply_src) #define V_ripcb VNET_INET(ripcb) #define V_ripcbinfo VNET_INET(ripcbinfo) -#define V_ripcb_zone VNET_INET(ripcb_zone) #define V_router_info_head VNET_INET(router_info_head) #define V_rsvp_on VNET_INET(rsvp_on) #define V_rtq_minreallyold VNET_INET(rtq_minreallyold)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200903041343.n24DhVYf001807>