remove recursive lock/unlock calls, we do them already before entering

the switch.

Reported by: Marta Carbone
This commit is contained in:
Luigi Rizzo 2010-02-17 13:06:06 +00:00
parent 82c59e57f3
commit 27c9c97a3e
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=204003

View File

@ -343,27 +343,22 @@ del_entry(struct ip_fw_chain *chain, u_int32_t arg)
break;
case 2: /* move rules with given number to new set */
IPFW_UH_WLOCK(chain);
for (i = 0; i < chain->n_rules; i++) {
rule = chain->map[i];
if (rule->rulenum == rulenum)
rule->set = new_set;
}
IPFW_UH_WUNLOCK(chain);
break;
case 3: /* move rules with given set number to new set */
IPFW_UH_WLOCK(chain);
for (i = 0; i < chain->n_rules; i++) {
rule = chain->map[i];
if (rule->set == rulenum)
rule->set = new_set;
}
IPFW_UH_WUNLOCK(chain);
break;
case 4: /* swap two sets */
IPFW_UH_WLOCK(chain);
for (i = 0; i < chain->n_rules; i++) {
rule = chain->map[i];
if (rule->set == rulenum)
@ -371,7 +366,6 @@ del_entry(struct ip_fw_chain *chain, u_int32_t arg)
else if (rule->set == new_set)
rule->set = rulenum;
}
IPFW_UH_WUNLOCK(chain);
break;
}
rule = chain->reap;