@@ -4126,7 +4126,7 @@ static int nf_tables_newset(struct net *net, struct sock *nlsk,
4126
4126
return err ;
4127
4127
}
4128
4128
4129
- static void nft_set_destroy (struct nft_set * set )
4129
+ static void nft_set_destroy (const struct nft_ctx * ctx , struct nft_set * set )
4130
4130
{
4131
4131
if (WARN_ON (set -> use > 0 ))
4132
4132
return ;
@@ -4271,7 +4271,7 @@ EXPORT_SYMBOL_GPL(nf_tables_deactivate_set);
4271
4271
void nf_tables_destroy_set (const struct nft_ctx * ctx , struct nft_set * set )
4272
4272
{
4273
4273
if (list_empty (& set -> bindings ) && nft_set_is_anonymous (set ))
4274
- nft_set_destroy (set );
4274
+ nft_set_destroy (ctx , set );
4275
4275
}
4276
4276
EXPORT_SYMBOL_GPL (nf_tables_destroy_set );
4277
4277
@@ -7020,7 +7020,7 @@ static void nft_commit_release(struct nft_trans *trans)
7020
7020
nf_tables_rule_destroy (& trans -> ctx , nft_trans_rule (trans ));
7021
7021
break ;
7022
7022
case NFT_MSG_DELSET :
7023
- nft_set_destroy (nft_trans_set (trans ));
7023
+ nft_set_destroy (& trans -> ctx , nft_trans_set (trans ));
7024
7024
break ;
7025
7025
case NFT_MSG_DELSETELEM :
7026
7026
nf_tables_set_elem_destroy (& trans -> ctx ,
@@ -7451,7 +7451,7 @@ static void nf_tables_abort_release(struct nft_trans *trans)
7451
7451
nf_tables_rule_destroy (& trans -> ctx , nft_trans_rule (trans ));
7452
7452
break ;
7453
7453
case NFT_MSG_NEWSET :
7454
- nft_set_destroy (nft_trans_set (trans ));
7454
+ nft_set_destroy (& trans -> ctx , nft_trans_set (trans ));
7455
7455
break ;
7456
7456
case NFT_MSG_NEWSETELEM :
7457
7457
nft_set_elem_destroy (nft_trans_elem_set (trans ),
@@ -8177,7 +8177,7 @@ static void __nft_release_tables(struct net *net)
8177
8177
list_for_each_entry_safe (set , ns , & table -> sets , list ) {
8178
8178
list_del (& set -> list );
8179
8179
table -> use -- ;
8180
- nft_set_destroy (set );
8180
+ nft_set_destroy (& ctx , set );
8181
8181
}
8182
8182
list_for_each_entry_safe (obj , ne , & table -> objects , list ) {
8183
8183
nft_obj_del (obj );
0 commit comments