malhuda/msm-4.14
1
0
Fork 0
mirror of https://github.com/rd-stuffs/msm-4.14.git synced 2025-02-20 11:45:48 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

netfilter: nftables: rename set element data activation/deactivation functions

Browse Source 
commit f8bb7889af58d8e74d2d61c76b1418230f1610fa upstream.

Rename:

- nft_set_elem_activate() to nft_set_elem_data_activate().
- nft_set_elem_deactivate() to nft_set_elem_data_deactivate().

To prepare for updates in the set element infrastructure to add support
for the special catch-all element.

Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
(cherry picked from commit 68b10f33a37e942bdc06b9cb313ad4e1b1f612e8)
Signed-off-by: Vegard Nossum <vegard.nossum@oracle.com>
This commit is contained in:
Pablo Neira Ayuso 2024-06-13 03:01:31 +02:00 committed by Vegard Nossum
parent c4af59f2d8
commit b42c75cd69
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
net/netfilter/nf_tables_api.c
View File

@ -4018,8 +4018,8 @@ void nft_set_elem_destroy(const struct nft_set *set, void *elem,
} }
EXPORT_SYMBOL_GPL(nft_set_elem_destroy); EXPORT_SYMBOL_GPL(nft_set_elem_destroy);
/* Only called from commit path, nft_set_elem_deactivate() already deals with /* Only called from commit path, nft_setelem_data_deactivate() already deals
* the refcounting from the preparation phase. * with the refcounting from the preparation phase.
*/ */
static void nf_tables_set_elem_destroy(const struct nft_set *set, void *elem) static void nf_tables_set_elem_destroy(const struct nft_set *set, void *elem)
{ {
@ -4352,9 +4352,9 @@ void nft_data_hold(const struct nft_data *data, enum nft_data_types type)
} }
} }
static void nft_set_elem_activate(const struct net *net, static void nft_setelem_data_activate(const struct net *net,
const struct nft_set *set, const struct nft_set *set,
struct nft_set_elem *elem) struct nft_set_elem *elem)
{ {
const struct nft_set_ext *ext = nft_set_elem_ext(set, elem->priv); const struct nft_set_ext *ext = nft_set_elem_ext(set, elem->priv);
@ -4364,9 +4364,9 @@ static void nft_set_elem_activate(const struct net *net,
nft_use_inc_restore(&(*nft_set_ext_obj(ext))->use); nft_use_inc_restore(&(*nft_set_ext_obj(ext))->use);
} }
static void nft_set_elem_deactivate(const struct net *net, static void nft_setelem_data_deactivate(const struct net *net,
const struct nft_set *set, const struct nft_set *set,
struct nft_set_elem *elem) struct nft_set_elem *elem)
{ {
const struct nft_set_ext *ext = nft_set_elem_ext(set, elem->priv); const struct nft_set_ext *ext = nft_set_elem_ext(set, elem->priv);
@ -4433,7 +4433,7 @@ static int nft_del_setelem(struct nft_ctx *ctx, struct nft_set *set,
kfree(elem.priv); kfree(elem.priv);
elem.priv = priv; elem.priv = priv;
nft_set_elem_deactivate(ctx->net, set, &elem); nft_setelem_data_deactivate(ctx->net, set, &elem);
nft_trans_elem(trans) = elem; nft_trans_elem(trans) = elem;
list_add_tail(&trans->list, &ctx->net->nft.commit_list); list_add_tail(&trans->list, &ctx->net->nft.commit_list);
@ -4467,7 +4467,7 @@ static int nft_flush_set(const struct nft_ctx *ctx,
} }
set->ndeact++; set->ndeact++;
nft_set_elem_deactivate(ctx->net, set, elem); nft_setelem_data_deactivate(ctx->net, set, elem);
nft_trans_elem_set(trans) = set; nft_trans_elem_set(trans) = set;
nft_trans_elem(trans) = *elem; nft_trans_elem(trans) = *elem;
list_add_tail(&trans->list, &ctx->net->nft.commit_list); list_add_tail(&trans->list, &ctx->net->nft.commit_list);
@ -5552,7 +5552,7 @@ static int nf_tables_abort(struct net *net, struct sk_buff *skb)
case NFT_MSG_DELSETELEM: case NFT_MSG_DELSETELEM:
te = (struct nft_trans_elem *)trans->data; te = (struct nft_trans_elem *)trans->data;
nft_set_elem_activate(net, te->set, &te->elem); nft_setelem_data_activate(net, te->set, &te->elem);
te->set->ops->activate(net, te->set, &te->elem); te->set->ops->activate(net, te->set, &te->elem);
te->set->ndeact--; te->set->ndeact--;