X-Git-Url: https://git.lttng.org/?p=urcu.git;a=blobdiff_plain;f=urcu%2Fstatic%2Fwfstack.h;h=2666b0ef3ff806435ea81710e6add099b90e44af;hp=eb12f377d1e1d974c43b2705bd6eab73d5634550;hb=d8a93addc87227dc5d4f6aa4cf79afb9b05c245b;hpb=718eb63eed91f0a06afd1a129813275ecc3e21eb

diff --git a/urcu/static/wfstack.h b/urcu/static/wfstack.h
index eb12f37..2666b0e 100644
--- a/urcu/static/wfstack.h
+++ b/urcu/static/wfstack.h
@@ -160,7 +160,7 @@ ___cds_wfs_node_sync_next(struct cds_wfs_node *node, int blocking)
 		if (!blocking)
 			return CDS_WFS_WOULDBLOCK;
 		if (++attempt >= CDS_WFS_ADAPT_ATTEMPTS) {
-			poll(NULL, 0, CDS_WFS_WAIT);	/* Wait for 10ms */
+			(void) poll(NULL, 0, CDS_WFS_WAIT);	/* Wait for 10ms */
 			attempt = 0;
 		} else {
 			caa_cpu_relax();
@@ -172,10 +172,11 @@ ___cds_wfs_node_sync_next(struct cds_wfs_node *node, int blocking)
 
 static inline
 struct cds_wfs_node *
-___cds_wfs_pop(struct cds_wfs_stack *s, int *state, int blocking)
+___cds_wfs_pop(cds_wfs_stack_ptr_t u_stack, int *state, int blocking)
 {
 	struct cds_wfs_head *head, *new_head;
 	struct cds_wfs_node *next;
+	struct __cds_wfs_stack *s = u_stack._s;
 
 	if (state)
 		*state = 0;
@@ -221,16 +222,16 @@ ___cds_wfs_pop(struct cds_wfs_stack *s, int *state, int blocking)
  */
 static inline
 struct cds_wfs_node *
-___cds_wfs_pop_with_state_blocking(struct cds_wfs_stack *s, int *state)
+___cds_wfs_pop_with_state_blocking(cds_wfs_stack_ptr_t u_stack, int *state)
 {
-	return ___cds_wfs_pop(s, state, 1);
+	return ___cds_wfs_pop(u_stack, state, 1);
 }
 
 static inline
 struct cds_wfs_node *
-___cds_wfs_pop_blocking(struct cds_wfs_stack *s)
+___cds_wfs_pop_blocking(cds_wfs_stack_ptr_t u_stack)
 {
-	return ___cds_wfs_pop_with_state_blocking(s, NULL);
+	return ___cds_wfs_pop_with_state_blocking(u_stack, NULL);
 }
 
 /*
@@ -243,9 +244,9 @@ ___cds_wfs_pop_blocking(struct cds_wfs_stack *s)
  */
 static inline
 struct cds_wfs_node *
-___cds_wfs_pop_with_state_nonblocking(struct cds_wfs_stack *s, int *state)
+___cds_wfs_pop_with_state_nonblocking(cds_wfs_stack_ptr_t u_stack, int *state)
 {
-	return ___cds_wfs_pop(s, state, 0);
+	return ___cds_wfs_pop(u_stack, state, 0);
 }
 
 /*
@@ -256,9 +257,9 @@ ___cds_wfs_pop_with_state_nonblocking(struct cds_wfs_stack *s, int *state)
  */
 static inline
 struct cds_wfs_node *
-___cds_wfs_pop_nonblocking(struct cds_wfs_stack *s)
+___cds_wfs_pop_nonblocking(cds_wfs_stack_ptr_t u_stack)
 {
-	return ___cds_wfs_pop_with_state_nonblocking(s, NULL);
+	return ___cds_wfs_pop_with_state_nonblocking(u_stack, NULL);
 }
 
 /*