netfilter: nft_set_rbtree: remove seqcount_rwlock_t

After the conversion to binary search array, this is not required anymore.
Remove it.

Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: Florian Westphal <fw@strlen.de>

diff --git a/net/netfilter/nft_set_rbtree.c b/net/netfilter/nft_set_rbtree.c
index de2cce96023e95a5ea9ac8f2a5465986f29d1487..7598c368c4e5b4ddade289b4173f050c913d6561 100644 (file)
--- a/net/netfilter/nft_set_rbtree.c
+++ b/net/netfilter/nft_set_rbtree.c
@@ -33,7 +33,6 @@ struct nft_rbtree {
        rwlock_t                lock;
        struct nft_array __rcu  *array;
        struct nft_array        *array_next;
-       seqcount_rwlock_t       count;
        unsigned long           last_gc;
 };
 
@@ -539,9 +538,7 @@ static int nft_rbtree_insert(const struct net *net, const struct nft_set *set,
                cond_resched();
 
                write_lock_bh(&priv->lock);
-               write_seqcount_begin(&priv->count);
                err = __nft_rbtree_insert(net, set, rbe, elem_priv);
-               write_seqcount_end(&priv->count);
                write_unlock_bh(&priv->lock);
        } while (err == -EAGAIN);
 
@@ -551,9 +548,7 @@ static int nft_rbtree_insert(const struct net *net, const struct nft_set *set,
 static void nft_rbtree_erase(struct nft_rbtree *priv, struct nft_rbtree_elem *rbe)
 {
        write_lock_bh(&priv->lock);
-       write_seqcount_begin(&priv->count);
        rb_erase(&rbe->node, &priv->root);
-       write_seqcount_end(&priv->count);
        write_unlock_bh(&priv->lock);
 }
 
@@ -765,7 +760,6 @@ static int nft_rbtree_init(const struct nft_set *set,
        BUILD_BUG_ON(offsetof(struct nft_rbtree_elem, priv) != 0);
 
        rwlock_init(&priv->lock);
-       seqcount_rwlock_init(&priv->count, &priv->lock);
        priv->root = RB_ROOT;
 
        priv->array = NULL;