cds containers: lfqueue and lfstack: don't depend on a particular rcu flavor

[urcu.git] / urcu / rculfstack-static.h

diff --git a/urcu/rculfstack-static.h b/urcu/rculfstack-static.h
index f541d40508f1ee05d3f046cb0f0d5add5f18c48c..7caf3c8c0d15f344170c33873f4cb6f4b4d107fa 100644 (file)
--- a/urcu/rculfstack-static.h
+++ b/urcu/rculfstack-static.h
@@ -61,6 +61,8 @@ void _cds_lfs_push_rcu(struct cds_lfs_stack_rcu *s, struct cds_lfs_node_rcu *nod
 }
 
 /*
+ * Should be called under rcu read-side lock.
+ *
  * The caller must wait for a grace period to pass before freeing the returned
  * node or modifying the cds_lfs_node_rcu structure.
  * Returns NULL if stack is empty.
@@ -71,22 +73,18 @@ _cds_lfs_pop_rcu(struct cds_lfs_stack_rcu *s)
        for (;;) {
                struct cds_lfs_node_rcu *head;
 
-               rcu_read_lock();
                head = rcu_dereference(s->head);
                if (head) {
                        struct cds_lfs_node_rcu *next = rcu_dereference(head->next);
 
                        if (uatomic_cmpxchg(&s->head, head, next) == head) {
-                               rcu_read_unlock();
                                return head;
                        } else {
                                /* Concurrent modification. Retry. */
-                               rcu_read_unlock();
                                continue;
                        }
                } else {
                        /* Empty stack */
-                       rcu_read_unlock();
                        return NULL;
                }
        }