X-Git-Url: https://git.liburcu.org/?p=urcu.git;a=blobdiff_plain;f=urcu-bp-static.h;h=6d7e3c874cff4c60f869a15f368324b3b080efde;hp=933f2349a4c015dc9c77ffbabe9491cb3357a3fb;hb=53706aa68118271d0d14bd5f1baa7ea1c4cf9754;hpb=02be55611d3b1c7bf4fdfcb3a9c98f621882d417

diff --git a/urcu-bp-static.h b/urcu-bp-static.h
index 933f234..6d7e3c8 100644
--- a/urcu-bp-static.h
+++ b/urcu-bp-static.h
@@ -9,7 +9,7 @@
  * TO BE INCLUDED ONLY IN LGPL-COMPATIBLE CODE. See urcu.h for linking
  * dynamically with the userspace rcu library.
  *
- * Copyright (c) 2009 Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
+ * Copyright (c) 2009 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  * Copyright (c) 2009 Paul E. McKenney, IBM Corporation.
  *
  * This library is free software; you can redistribute it and/or
@@ -140,7 +140,7 @@ struct rcu_reader {
 	/* Data used by both reader and synchronize_rcu() */
 	long ctr;
 	/* Data used for registry */
-	struct list_head head __attribute__((aligned(CACHE_LINE_SIZE)));
+	struct list_head node __attribute__((aligned(CACHE_LINE_SIZE)));
 	pthread_t tid;
 	int alloc;	/* registry entry allocated */
 };
@@ -175,6 +175,7 @@ static inline void _rcu_read_lock(void)
 	if (unlikely(!rcu_reader))
 		rcu_bp_register();
 
+	barrier();	/* Ensure the compiler does not reorder us with mutex */
 	tmp = rcu_reader->ctr;
 	/*
 	 * rcu_gp_ctr is
@@ -199,6 +200,7 @@ static inline void _rcu_read_unlock(void)
 	 */
 	smp_mb();
 	_STORE_SHARED(rcu_reader->ctr, rcu_reader->ctr - RCU_GP_COUNT);
+	barrier();	/* Ensure the compiler does not reorder us with mutex */
 }
 
 #ifdef __cplusplus