kpriv/linux-hardened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

netfilter: nf_tables: rename to nft_set_lookup_global()

Browse source 
To prepare shorter introduction of shorter function prefix.

Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
This commit is contained in:
Pablo Neira Ayuso 2018-03-28 12:06:49 +02:00
parent 43a605f2f7
commit 10659cbab7
5 changed files with 19 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
include/net/netfilter/nf_tables.h
View file

@ -434,11 +434,11 @@ static inline struct nft_set *nft_set_container_of(const void *priv)
return (void *)priv - offsetof(struct nft_set, data); return (void *)priv - offsetof(struct nft_set, data);
} }
struct nft_set *nft_set_lookup(const struct net *net, struct nft_set *nft_set_lookup_global(const struct net *net,
const struct nft_table *table, const struct nft_table *table,
const struct nlattr *nla_set_name, const struct nlattr *nla_set_name,
const struct nlattr *nla_set_id, const struct nlattr *nla_set_id,
u8 genmask); u8 genmask);
static inline unsigned long nft_set_gc_interval(const struct nft_set *set) static inline unsigned long nft_set_gc_interval(const struct nft_set *set)
{ {

12
net/netfilter/nf_tables_api.c
View file

@ -2633,11 +2633,11 @@ static struct nft_set *nf_tables_set_lookup_byid(const struct net *net,
return ERR_PTR(-ENOENT); return ERR_PTR(-ENOENT);
} }
struct nft_set *nft_set_lookup(const struct net *net, struct nft_set *nft_set_lookup_global(const struct net *net,
const struct nft_table *table, const struct nft_table *table,
const struct nlattr *nla_set_name, const struct nlattr *nla_set_name,
const struct nlattr *nla_set_id, const struct nlattr *nla_set_id,
u8 genmask) u8 genmask)
{ {
struct nft_set *set; struct nft_set *set;
@ -2650,7 +2650,7 @@ struct nft_set *nft_set_lookup(const struct net *net,
} }
return set; return set;
} }
EXPORT_SYMBOL_GPL(nft_set_lookup); EXPORT_SYMBOL_GPL(nft_set_lookup_global);
static int nf_tables_set_alloc_name(struct nft_ctx *ctx, struct nft_set *set, static int nf_tables_set_alloc_name(struct nft_ctx *ctx, struct nft_set *set,
const char *name) const char *name)

5
net/netfilter/nft_dynset.c
View file

@ -132,8 +132,9 @@ static int nft_dynset_init(const struct nft_ctx *ctx,
priv->invert = true; priv->invert = true;
} }
set = nft_set_lookup(ctx->net, ctx->table, tb[NFTA_DYNSET_SET_NAME], set = nft_set_lookup_global(ctx->net, ctx->table,
tb[NFTA_DYNSET_SET_ID], genmask); tb[NFTA_DYNSET_SET_NAME],
tb[NFTA_DYNSET_SET_ID], genmask);
if (IS_ERR(set)) if (IS_ERR(set))
return PTR_ERR(set); return PTR_ERR(set);

4
net/netfilter/nft_lookup.c
View file

@ -71,8 +71,8 @@ static int nft_lookup_init(const struct nft_ctx *ctx,
tb[NFTA_LOOKUP_SREG] == NULL) tb[NFTA_LOOKUP_SREG] == NULL)
return -EINVAL; return -EINVAL;
set = nft_set_lookup(ctx->net, ctx->table, tb[NFTA_LOOKUP_SET], set = nft_set_lookup_global(ctx->net, ctx->table, tb[NFTA_LOOKUP_SET],
tb[NFTA_LOOKUP_SET_ID], genmask); tb[NFTA_LOOKUP_SET_ID], genmask);
if (IS_ERR(set)) if (IS_ERR(set))
return PTR_ERR(set); return PTR_ERR(set);

5
net/netfilter/nft_objref.c
View file

@ -117,8 +117,9 @@ static int nft_objref_map_init(const struct nft_ctx *ctx,
struct nft_set *set; struct nft_set *set;
int err; int err;
set = nft_set_lookup(ctx->net, ctx->table, tb[NFTA_OBJREF_SET_NAME], set = nft_set_lookup_global(ctx->net, ctx->table,
tb[NFTA_OBJREF_SET_ID], genmask); tb[NFTA_OBJREF_SET_NAME],
tb[NFTA_OBJREF_SET_ID], genmask);
if (IS_ERR(set)) if (IS_ERR(set))
return PTR_ERR(set); return PTR_ERR(set);