Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[linux-2.6-block.git] / net / netfilter / nft_hash.c

diff --git a/net/netfilter/nft_hash.c b/net/netfilter/nft_hash.c
index 37c15e6748841053df56fe092a49ced6fb06b077..ad3966976cf598572653c7a030281d148c1a7698 100644 (file)
--- a/net/netfilter/nft_hash.c
+++ b/net/netfilter/nft_hash.c
@@ -29,6 +29,8 @@ struct nft_hash_elem {
        struct nft_data                 data[];
 };
 
+static const struct rhashtable_params nft_hash_params;
+
 static bool nft_hash_lookup(const struct nft_set *set,
                            const struct nft_data *key,
                            struct nft_data *data)
@@ -36,7 +38,7 @@ static bool nft_hash_lookup(const struct nft_set *set,
        struct rhashtable *priv = nft_set_priv(set);
        const struct nft_hash_elem *he;
 
-       he = rhashtable_lookup(priv, key);
+       he = rhashtable_lookup_fast(priv, key, nft_hash_params);
        if (he && set->flags & NFT_SET_MAP)
                nft_data_copy(data, he->data);
 
@@ -49,6 +51,7 @@ static int nft_hash_insert(const struct nft_set *set,
        struct rhashtable *priv = nft_set_priv(set);
        struct nft_hash_elem *he;
        unsigned int size;
+       int err;
 
        if (elem->flags != 0)
                return -EINVAL;
@@ -65,9 +68,11 @@ static int nft_hash_insert(const struct nft_set *set,
        if (set->flags & NFT_SET_MAP)
                nft_data_copy(he->data, &elem->data);
 
-       rhashtable_insert(priv, &he->node);
+       err = rhashtable_insert_fast(priv, &he->node, nft_hash_params);
+       if (err)
+               kfree(he);
 
-       return 0;
+       return err;
 }
 
 static void nft_hash_elem_destroy(const struct nft_set *set,
@@ -84,46 +89,26 @@ static void nft_hash_remove(const struct nft_set *set,
 {
        struct rhashtable *priv = nft_set_priv(set);
 
-       rhashtable_remove(priv, elem->cookie);
+       rhashtable_remove_fast(priv, elem->cookie, nft_hash_params);
        synchronize_rcu();
        kfree(elem->cookie);
 }
 
-struct nft_compare_arg {
-       const struct nft_set *set;
-       struct nft_set_elem *elem;
-};
-
-static bool nft_hash_compare(void *ptr, void *arg)
-{
-       struct nft_hash_elem *he = ptr;
-       struct nft_compare_arg *x = arg;
-
-       if (!nft_data_cmp(&he->key, &x->elem->key, x->set->klen)) {
-               x->elem->cookie = he;
-               x->elem->flags = 0;
-               if (x->set->flags & NFT_SET_MAP)
-                       nft_data_copy(&x->elem->data, he->data);
-
-               return true;
-       }
-
-       return false;
-}
-
 static int nft_hash_get(const struct nft_set *set, struct nft_set_elem *elem)
 {
        struct rhashtable *priv = nft_set_priv(set);
-       struct nft_compare_arg arg = {
-               .set = set,
-               .elem = elem,
-       };
+       struct nft_hash_elem *he;
+
+       he = rhashtable_lookup_fast(priv, &elem->key, nft_hash_params);
+       if (!he)
+               return -ENOENT;
 
-       if (rhashtable_lookup_compare(priv, &elem->key,
-                                     &nft_hash_compare, &arg))
-               return 0;
+       elem->cookie = he;
+       elem->flags = 0;
+       if (set->flags & NFT_SET_MAP)
+               nft_data_copy(&elem->data, he->data);
 
-       return -ENOENT;
+       return 0;
 }
 
 static void nft_hash_walk(const struct nft_ctx *ctx, const struct nft_set *set,
@@ -183,18 +168,21 @@ static unsigned int nft_hash_privsize(const struct nlattr * const nla[])
        return sizeof(struct rhashtable);
 }
 
+static const struct rhashtable_params nft_hash_params = {
+       .head_offset = offsetof(struct nft_hash_elem, node),
+       .key_offset = offsetof(struct nft_hash_elem, key),
+       .hashfn = jhash,
+};
+
 static int nft_hash_init(const struct nft_set *set,
                         const struct nft_set_desc *desc,
                         const struct nlattr * const tb[])
 {
        struct rhashtable *priv = nft_set_priv(set);
-       struct rhashtable_params params = {
-               .nelem_hint = desc->size ? : NFT_HASH_ELEMENT_HINT,
-               .head_offset = offsetof(struct nft_hash_elem, node),
-               .key_offset = offsetof(struct nft_hash_elem, key),
-               .key_len = set->klen,
-               .hashfn = jhash,
-       };
+       struct rhashtable_params params = nft_hash_params;
+
+       params.nelem_hint = desc->size ?: NFT_HASH_ELEMENT_HINT;
+       params.key_len = set->klen;
 
        return rhashtable_init(priv, &params);
 }