|
@@ -774,7 +774,7 @@ static int nft_flush_table(struct nft_ctx *ctx)
|
|
|
if (!nft_is_active_next(ctx->net, set))
|
|
|
continue;
|
|
|
|
|
|
- if (set->flags & NFT_SET_ANONYMOUS &&
|
|
|
+ if (nft_set_is_anonymous(set) &&
|
|
|
!list_empty(&set->bindings))
|
|
|
continue;
|
|
|
|
|
@@ -3284,7 +3284,7 @@ int nf_tables_bind_set(const struct nft_ctx *ctx, struct nft_set *set,
|
|
|
struct nft_set_binding *i;
|
|
|
struct nft_set_iter iter;
|
|
|
|
|
|
- if (!list_empty(&set->bindings) && set->flags & NFT_SET_ANONYMOUS)
|
|
|
+ if (!list_empty(&set->bindings) && nft_set_is_anonymous(set))
|
|
|
return -EBUSY;
|
|
|
|
|
|
if (binding->flags & NFT_SET_MAP) {
|
|
@@ -3319,7 +3319,7 @@ void nf_tables_unbind_set(const struct nft_ctx *ctx, struct nft_set *set,
|
|
|
{
|
|
|
list_del_rcu(&binding->list);
|
|
|
|
|
|
- if (list_empty(&set->bindings) && set->flags & NFT_SET_ANONYMOUS &&
|
|
|
+ if (list_empty(&set->bindings) && nft_set_is_anonymous(set) &&
|
|
|
nft_is_active(ctx->net, set))
|
|
|
nf_tables_set_destroy(ctx, set);
|
|
|
}
|
|
@@ -5157,7 +5157,7 @@ static int nf_tables_commit(struct net *net, struct sk_buff *skb)
|
|
|
/* This avoids hitting -EBUSY when deleting the table
|
|
|
* from the transaction.
|
|
|
*/
|
|
|
- if (nft_trans_set(trans)->flags & NFT_SET_ANONYMOUS &&
|
|
|
+ if (nft_set_is_anonymous(nft_trans_set(trans)) &&
|
|
|
!list_empty(&nft_trans_set(trans)->bindings))
|
|
|
trans->ctx.table->use--;
|
|
|
|