netfilter: nf_tables: rename to nft_set_lookup_global()

To prepare shorter introduction of shorter function prefix.

Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

diff --git a/include/net/netfilter/nf_tables.h b/include/net/netfilter/nf_tables.h
index e26b94a61a99d973c40b9ce315828a6728d3db67..bd2a18d66189e6b4dfafb05a2da711057f25377a 100644 (file)
--- a/include/net/netfilter/nf_tables.h
+++ b/include/net/netfilter/nf_tables.h
@@ -434,11 +434,11 @@ static inline struct nft_set *nft_set_container_of(const void *priv)
        return (void *)priv - offsetof(struct nft_set, data);
 }
 
-struct nft_set *nft_set_lookup(const struct net *net,
-                              const struct nft_table *table,
-                              const struct nlattr *nla_set_name,
-                              const struct nlattr *nla_set_id,
-                              u8 genmask);
+struct nft_set *nft_set_lookup_global(const struct net *net,
+                                     const struct nft_table *table,
+                                     const struct nlattr *nla_set_name,
+                                     const struct nlattr *nla_set_id,
+                                     u8 genmask);
 
 static inline unsigned long nft_set_gc_interval(const struct nft_set *set)
 {

diff --git a/net/netfilter/nf_tables_api.c b/net/netfilter/nf_tables_api.c
index af8b6a7488bdd49f32cc3c9077cc4a6b5b84f6ae..769d84015073b2f4f838fadfd0faa816a6cae4f0 100644 (file)
--- a/net/netfilter/nf_tables_api.c
+++ b/net/netfilter/nf_tables_api.c
@@ -2633,11 +2633,11 @@ static struct nft_set *nf_tables_set_lookup_byid(const struct net *net,
        return ERR_PTR(-ENOENT);
 }
 
-struct nft_set *nft_set_lookup(const struct net *net,
-                              const struct nft_table *table,
-                              const struct nlattr *nla_set_name,
-                              const struct nlattr *nla_set_id,
-                              u8 genmask)
+struct nft_set *nft_set_lookup_global(const struct net *net,
+                                     const struct nft_table *table,
+                                     const struct nlattr *nla_set_name,
+                                     const struct nlattr *nla_set_id,
+                                     u8 genmask)
 {
        struct nft_set *set;
 
@@ -2650,7 +2650,7 @@ struct nft_set *nft_set_lookup(const struct net *net,
        }
        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,
                                    const char *name)

diff --git a/net/netfilter/nft_dynset.c b/net/netfilter/nft_dynset.c
index fc83e29d6634eab5ec65e22808f5d13cc615a058..04863fad05ddd23c33f679232fd926ac57888590 100644 (file)
--- a/net/netfilter/nft_dynset.c
+++ b/net/netfilter/nft_dynset.c
@@ -132,8 +132,9 @@ static int nft_dynset_init(const struct nft_ctx *ctx,
                        priv->invert = true;
        }
 
-       set = nft_set_lookup(ctx->net, ctx->table, tb[NFTA_DYNSET_SET_NAME],
-                            tb[NFTA_DYNSET_SET_ID], genmask);
+       set = nft_set_lookup_global(ctx->net, ctx->table,
+                                   tb[NFTA_DYNSET_SET_NAME],
+                                   tb[NFTA_DYNSET_SET_ID], genmask);
        if (IS_ERR(set))
                return PTR_ERR(set);
 

diff --git a/net/netfilter/nft_lookup.c b/net/netfilter/nft_lookup.c
index 475570e89ede710b323868792bb16fd5f09d1b09..f52da5e2199fe4e55febfc5bf4366acfddc87889 100644 (file)
--- a/net/netfilter/nft_lookup.c
+++ b/net/netfilter/nft_lookup.c
@@ -71,8 +71,8 @@ static int nft_lookup_init(const struct nft_ctx *ctx,
            tb[NFTA_LOOKUP_SREG] == NULL)
                return -EINVAL;
 
-       set = nft_set_lookup(ctx->net, ctx->table, tb[NFTA_LOOKUP_SET],
-                            tb[NFTA_LOOKUP_SET_ID], genmask);
+       set = nft_set_lookup_global(ctx->net, ctx->table, tb[NFTA_LOOKUP_SET],
+                                   tb[NFTA_LOOKUP_SET_ID], genmask);
        if (IS_ERR(set))
                return PTR_ERR(set);
 

diff --git a/net/netfilter/nft_objref.c b/net/netfilter/nft_objref.c
index 7bcdc48f3d737a45758da58102638eab6f7cd7cf..0b02407773ad270eb0cea79e2ef2e32cf320cfa6 100644 (file)
--- a/net/netfilter/nft_objref.c
+++ b/net/netfilter/nft_objref.c
@@ -117,8 +117,9 @@ static int nft_objref_map_init(const struct nft_ctx *ctx,
        struct nft_set *set;
        int err;
 
-       set = nft_set_lookup(ctx->net, ctx->table, tb[NFTA_OBJREF_SET_NAME],
-                            tb[NFTA_OBJREF_SET_ID], genmask);
+       set = nft_set_lookup_global(ctx->net, ctx->table,
+                                   tb[NFTA_OBJREF_SET_NAME],
+                                   tb[NFTA_OBJREF_SET_ID], genmask);
        if (IS_ERR(set))
                return PTR_ERR(set);