Fix: rcuja merge fixes

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

diff --git a/urcu/hlist.h b/urcu/hlist.h
index 9f4332ac87d9afd33e48e5de6dcd3c4a96d5da88..f8624b1697406a05659f70706d72deacf5c65188 100644 (file)
--- a/urcu/hlist.h
+++ b/urcu/hlist.h
@@ -43,6 +43,16 @@ void CDS_INIT_HLIST_HEAD(struct cds_hlist_head *ptr)
 #define cds_hlist_entry(ptr, type, member) \
        ((type *) ((char *) (ptr) - (unsigned long) (&((type *) 0)->member)))
 
+/* Get first entry from a list. Assumes the hlist is not empty. */
+#define cds_hlist_first_entry(ptr, type, member) \
+       cds_list_entry((ptr)->next, type, member)
+
+static inline
+int cds_hlist_empty(struct cds_hlist_head *head)
+{
+       return !head->next;
+}
+
 /* Add new element at the head of the list. */
 static inline
 void cds_hlist_add_head(struct cds_hlist_node *newp,
@@ -93,14 +103,18 @@ void cds_hlist_del(struct cds_hlist_node *elem)
                        entry = cds_hlist_entry(pos, __typeof__(*entry), member))
 
 #define cds_hlist_for_each_entry_2(entry, head, member) \
-       for (entry = cds_hlist_entry((head)->next, __typeof__(*entry), member); \
-               &entry->member != NULL; \
-               entry = cds_hlist_entry(entry->member.next, __typeof__(*entry), member))
+       for (entry = ((head)->next == NULL ? NULL \
+                       : cds_hlist_entry((head)->next, __typeof__(*entry), member)); \
+               entry != NULL; \
+               entry = (entry->member.next == NULL ? NULL \
+                       : cds_hlist_entry(entry->member.next, __typeof__(*entry), member)))
 
 #define cds_hlist_for_each_entry_safe_2(entry, e, head, member) \
-       for (entry = cds_hlist_entry((head)->next, __typeof__(*entry), member); \
-               (&entry->member != NULL) && (e = cds_hlist_entry(entry->member.next, \
-                                               __typeof__(*entry), member), 1); \
+       for (entry = ((head)->next == NULL ? NULL \
+                       : cds_hlist_entry((head)->next, __typeof__(*entry), member)); \
+               (entry != NULL) && (e = (entry->member.next == NULL ? NULL \
+                                       : cds_hlist_entry(entry->member.next, \
+                                               __typeof__(*entry), member)), 1); \
                entry = e)
 
 #endif /* _KCOMPAT_HLIST_H */