X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=rculfhash.c;h=c1ff314bc0d5cc748e1329d8508f72641ae804ad;hb=feda272217fca3604e904b83845814223b877287;hp=f214293196a6094958e8274e09aaf73bb627f276;hpb=caf3653dbe9dec81dc37c8e81267f27d3163dd19;p=userspace-rcu.git

diff --git a/rculfhash.c b/rculfhash.c
index f214293..c1ff314 100644
--- a/rculfhash.c
+++ b/rculfhash.c
@@ -779,9 +779,9 @@ int _cds_lfht_replace(struct cds_lfht *ht, unsigned long size,
 			 */
 			return -ENOENT;
 		}
-		assert(!is_bucket(old_next));
-		assert(new_node != clear_flag(old_next));
-		new_node->next = clear_flag(old_next);
+		assert(old_next == clear_flag(old_next));
+		assert(new_node != old_next);
+		new_node->next = old_next;
 		/*
 		 * Here is the whole trick for lock-free replace: we add
 		 * the replacement node _after_ the node we want to
@@ -1517,25 +1517,36 @@ struct cds_lfht_node *cds_lfht_add_replace(struct cds_lfht *ht,
 	}
 }
 
-int cds_lfht_replace(struct cds_lfht *ht, struct cds_lfht_iter *old_iter,
+int cds_lfht_replace(struct cds_lfht *ht,
+		struct cds_lfht_iter *old_iter,
+		unsigned long hash,
+		cds_lfht_match_fct match,
+		const void *key,
 		struct cds_lfht_node *new_node)
 {
 	unsigned long size;
 
+	new_node->reverse_hash = bit_reverse_ulong((unsigned long) hash);
+	if (!old_iter->node)
+		return -ENOENT;
+	if (caa_unlikely(old_iter->node->reverse_hash != new_node->reverse_hash))
+		return -EINVAL;
+	if (caa_unlikely(!match(old_iter->node, key)))
+		return -EINVAL;
 	size = rcu_dereference(ht->size);
 	return _cds_lfht_replace(ht, size, old_iter->node, old_iter->next,
 			new_node);
 }
 
-int cds_lfht_del(struct cds_lfht *ht, struct cds_lfht_iter *iter)
+int cds_lfht_del(struct cds_lfht *ht, struct cds_lfht_node *node)
 {
 	unsigned long size, hash;
 	int ret;
 
 	size = rcu_dereference(ht->size);
-	ret = _cds_lfht_del(ht, size, iter->node);
+	ret = _cds_lfht_del(ht, size, node);
 	if (!ret) {
-		hash = bit_reverse_ulong(iter->node->reverse_hash);
+		hash = bit_reverse_ulong(node->reverse_hash);
 		ht_count_del(ht, size, hash);
 	}
 	return ret;