d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pf: Avoid warning without INVARIANTS

Browse Source 
When INVARIANTS is not set the 'last' variable is not used, which can generate
compiler warnings.
If this invariant is ever violated it'd result in a KASSERT failure in
refcount_release(), so this one is not strictly required.
This commit is contained in:
Kristof Provost 2018-02-01 07:52:06 +00:00
parent 619282986d
commit c201b5644d
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=328652
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/netpfil/pf/pf.c
View File

@ -1613,7 +1613,6 @@ int
pf_unlink_state(struct pf_state *s, u_int flags)
{
struct pf_idhash *ih = &V_pf_idhash[PF_IDHASH(s)];
int last;
if ((flags & PF_ENTER_LOCKED) == 0)
PF_HASHROW_LOCK(ih);
@ -1654,8 +1653,9 @@ pf_unlink_state(struct pf_state *s, u_int flags)
PF_HASHROW_UNLOCK(ih);
pf_detach_state(s);
last = refcount_release(&s->refs);
KASSERT(last == 0, ("Incorrect state reference count"));
/* pf_state_insert() initialises refs to 2, so we can never release the
* last reference here, only in pf_release_state(). */
(void)refcount_release(&s->refs);
return (pf_release_state(s));
}