Fix: rcuja merge fixes

[userspace-rcu.git] / urcu / rcuhlist.h

diff --git a/urcu/rcuhlist.h b/urcu/rcuhlist.h
index 6d88692e854faf51a4105a8c7d46baa5c624e6c6..b07c66b65ff1ccd33621f08e054594c375127bd7 100644 (file)
--- a/urcu/rcuhlist.h
+++ b/urcu/rcuhlist.h
@@ -50,10 +50,34 @@ void cds_hlist_del_rcu(struct cds_hlist_node *elem)
        CMM_STORE_SHARED(elem->prev->next, elem->next);
 }
 
+/*
+ * Get first element from a RCU hlist. Assumes the hlist is not empty.
+ * This must be done while rcu_read_lock() is held.
+ */
+#define cds_hlist_first_rcu(ptr, type) \
+       rcu_dereference((ptr)->next)
+
+/*
+ * Get first entry from a RCU hlist. Assumes the hlist is not empty.
+ * This must be done while rcu_read_lock() is held.
+ */
+#define cds_hlist_first_entry_rcu(ptr, type, member) \
+       cds_hlist_entry(rcu_dereference((ptr)->next), type, member)
+
 /*
  * Iterate through elements of the list.
  * This must be done while rcu_read_lock() is held.
  */
+#define cds_hlist_for_each_rcu(pos, head) \
+       for (pos = rcu_dereference((head)->next); pos != NULL; \
+               pos = rcu_dereference(pos->next))
+
+/*
+ * cds_hlist_for_each_entry_rcu takes 4 arguments, while the Linux
+ * kernel API only takes 3.
+ * We implement cds_hlist_for_each_entry_rcu_2() to follow the Linux
+ * kernel APIs.
+ */
 #define cds_hlist_for_each_entry_rcu(entry, pos, head, member) \
        for (pos = rcu_dereference((head)->next), \
                        entry = cds_hlist_entry(pos, __typeof__(*entry), member); \
@@ -61,4 +85,11 @@ void cds_hlist_del_rcu(struct cds_hlist_node *elem)
                pos = rcu_dereference(pos->next), \
                        entry = cds_hlist_entry(pos, __typeof__(*entry), member))
 
+#define cds_hlist_for_each_entry_rcu_2(entry, head, member) \
+       for (entry = cds_hlist_entry(rcu_dereference((head)->next), \
+                       __typeof__(*entry), member); \
+               &entry->member != NULL; \
+               entry = cds_hlist_entry(rcu_dereference(entry->member.next), \
+                       __typeof__(*entry), member))
+
 #endif /* _URCU_RCUHLIST_H */