Date: Sat, 14 Apr 2012 06:52:32 +0000 (UTC) From: Gleb Smirnoff <glebius@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r234271 - projects/pf/head/sys/contrib/pf/net Message-ID: <201204140652.q3E6qWUV017493@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: glebius Date: Sat Apr 14 06:52:31 2012 New Revision: 234271 URL: http://svn.freebsd.org/changeset/base/234271 Log: Remove PF_LOCK_ASSERT()s since this code can already be entered from pfsync swi, w/o pf Giant held. May be this is not safe, since tables aren't locked yet... Modified: projects/pf/head/sys/contrib/pf/net/pf_table.c Modified: projects/pf/head/sys/contrib/pf/net/pf_table.c ============================================================================== --- projects/pf/head/sys/contrib/pf/net/pf_table.c Sat Apr 14 05:48:04 2012 (r234270) +++ projects/pf/head/sys/contrib/pf/net/pf_table.c Sat Apr 14 06:52:31 2012 (r234271) @@ -730,7 +730,6 @@ pfr_lookup_addr(struct pfr_ktable *kt, s } if (ADDR_NETWORK(ad)) { pfr_prepare_network(&mask, ad->pfra_af, ad->pfra_net); - PF_LOCK_ASSERT(); ke = (struct pfr_kentry *)rn_lookup(&sa, &mask, head); if (ke && KENTRY_RNF_ROOT(ke)) ke = NULL; @@ -914,7 +913,6 @@ pfr_route_kentry(struct pfr_ktable *kt, else if (ke->pfrke_af == AF_INET6) head = kt->pfrkt_ip6; - PF_LOCK_ASSERT(); if (KENTRY_NETWORK(ke)) { pfr_prepare_network(&mask, ke->pfrke_af, ke->pfrke_net); rn = rn_addroute(&ke->pfrke_sa, &mask, head, ke->pfrke_node); @@ -936,7 +934,6 @@ pfr_unroute_kentry(struct pfr_ktable *kt else if (ke->pfrke_af == AF_INET6) head = kt->pfrkt_ip6; - PF_LOCK_ASSERT(); if (KENTRY_NETWORK(ke)) { pfr_prepare_network(&mask, ke->pfrke_af, ke->pfrke_net); rn = rn_delete(&ke->pfrke_sa, &mask, head);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201204140652.q3E6qWUV017493>