Date: Thu, 9 Apr 2015 08:37:16 +0000 (UTC) From: Gleb Smirnoff <glebius@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r281293 - head/sys/netinet Message-ID: <201504090837.t398bGHY067816@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: glebius Date: Thu Apr 9 08:37:16 2015 New Revision: 281293 URL: https://svnweb.freebsd.org/changeset/base/281293 Log: Rename ip_drain_locked() to ip_drain_vnet(), since the function differs from ip_drain() not in locking, but in the scope of its work. Sponsored by: Nginx, Inc. Modified: head/sys/netinet/ip_input.c Modified: head/sys/netinet/ip_input.c ============================================================================== --- head/sys/netinet/ip_input.c Thu Apr 9 07:52:03 2015 (r281292) +++ head/sys/netinet/ip_input.c Thu Apr 9 08:37:16 2015 (r281293) @@ -181,7 +181,7 @@ static struct mtx_padalign ipqlock[IPREA static void maxnipq_update(void); static void ipq_zone_change(void *); -static void ip_drain_locked(void); +static void ip_drain_vnet(void); static VNET_DEFINE(int, maxnipq); /* Administrative limit on # reass queues. */ static VNET_DEFINE(int, nipq); /* Total # of reass queues */ @@ -397,7 +397,7 @@ ip_destroy(void) /* Cleanup in_ifaddr hash table; should be empty. */ hashdestroy(V_in_ifaddrhashtbl, M_IFADDR, V_in_ifaddrhmask); - ip_drain_locked(); + ip_drain_vnet(); uma_zdestroy(V_ipq_zone); } @@ -1338,11 +1338,9 @@ ip_slowtimo(void) /* * Drain off all datagram fragments. - * - * Call without any IPQ locks held. */ static void -ip_drain_locked(void) +ip_drain_vnet(void) { int i; @@ -1365,7 +1363,7 @@ ip_drain(void) VNET_LIST_RLOCK_NOSLEEP(); VNET_FOREACH(vnet_iter) { CURVNET_SET(vnet_iter); - ip_drain_locked(); + ip_drain_vnet(); CURVNET_RESTORE(); } VNET_LIST_RUNLOCK_NOSLEEP();
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201504090837.t398bGHY067816>