Merge branch 'master' into urcu/ht

[urcu.git] / urcu / rculfhash.h

diff --git a/urcu/rculfhash.h b/urcu/rculfhash.h
index 99b43a8ba0ec4b178b60f1e9491b7176a3204f1f..40fe4df6bd763f81240b4d08d8bfa7047e344ec1 100644 (file)
--- a/urcu/rculfhash.h
+++ b/urcu/rculfhash.h
@@ -8,10 +8,14 @@
 extern "C" {
 #endif
 
+/*
+ * struct rcu_ht_node and struct _rcu_ht_node should be aligned on
+ * 4-bytes boundaries because the two lower bits are used as flags.
+ */
+
 struct _rcu_ht_node {
-       struct rcu_ht_node *next;
+       struct rcu_ht_node *next;       /* ptr | DUMMY_FLAG | REMOVED_FLAG */
        unsigned long reverse_hash;
-       unsigned int dummy;
 };
 
 struct rcu_ht_node {
@@ -41,7 +45,6 @@ void ht_node_init(struct rcu_ht_node *node, void *key,
 {
        node->key = key;
        node->key_len = key_len;
-       node->p.dummy = 0;
 }
 
 /*