X-Git-Url: https://git.liburcu.org/?p=urcu.git;a=blobdiff_plain;f=rculfhash.c;h=8f2d8e4480fda449fbe6dd9de2bb69a2659d8643;hp=5220cd5fd804321cf2b9b725c87b9e54d58296f2;hb=b65ec430efc1882ba63452a7fae7bbeea9446526;hpb=db00ccc36e7fb04ce8044fb1be7964acd1de6ae0 diff --git a/rculfhash.c b/rculfhash.c index 5220cd5..8f2d8e4 100644 --- a/rculfhash.c +++ b/rculfhash.c @@ -929,8 +929,7 @@ end: static int _cds_lfht_del(struct cds_lfht *ht, unsigned long size, - struct cds_lfht_node *node, - int bucket_removal) + struct cds_lfht_node *node) { struct cds_lfht_node *bucket, *next; @@ -951,10 +950,7 @@ int _cds_lfht_del(struct cds_lfht *ht, unsigned long size, next = rcu_dereference(node->next); if (caa_unlikely(is_removed(next))) return -ENOENT; - if (bucket_removal) - assert(is_bucket(next)); - else - assert(!is_bucket(next)); + assert(!is_bucket(next)); /* * We set the REMOVED_FLAG unconditionally. Note that there may * be more than one concurrent thread setting this flag. @@ -1537,7 +1533,7 @@ int cds_lfht_del(struct cds_lfht *ht, struct cds_lfht_iter *iter) int ret; size = rcu_dereference(ht->size); - ret = _cds_lfht_del(ht, size, iter->node, 0); + ret = _cds_lfht_del(ht, size, iter->node); if (!ret) { hash = bit_reverse_ulong(iter->node->reverse_hash); ht_count_del(ht, size, hash);