Merge branch 'master' into urcu/ht

[urcu.git] / urcu / rculfstack.h

diff --git a/urcu/rculfstack.h b/urcu/rculfstack.h
index 20ac26c3d2e8a13b8d64ae5e21a09459da9f53ca..75a580b58fe39e55af2b899ef38010fe66b3db0e 100644 (file)
--- a/urcu/rculfstack.h
+++ b/urcu/rculfstack.h
@@ -37,11 +37,11 @@ struct cds_lfs_stack_rcu {
 
 #ifdef _LGPL_SOURCE
 
-#include <urcu/rculfstack-static.h>
+#include <urcu/static/rculfstack.h>
 
 #define cds_lfs_node_init_rcu  _cds_lfs_node_init_rcu
-#define cds_lfs_init_rcu               _cds_lfs_init_rcu
-#define cds_lfs_push_rcu               _cds_lfs_push_rcu
+#define cds_lfs_init_rcu       _cds_lfs_init_rcu
+#define cds_lfs_push_rcu       _cds_lfs_push_rcu
 #define cds_lfs_pop_rcu                _cds_lfs_pop_rcu
 
 #else /* !_LGPL_SOURCE */
@@ -51,6 +51,8 @@ extern void cds_lfs_init_rcu(struct cds_lfs_stack_rcu *s);
 extern void cds_lfs_push_rcu(struct cds_lfs_stack_rcu *s, struct cds_lfs_node_rcu *node);
 
 /*
+ * Should be called under rcu read lock critical section.
+ *
  * 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.