X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=urcu%2Fstatic%2Furcu.h;h=3fb457b4e3e00916b2a2e06e172b4eced08f0df0;hb=cd21955a846566b3cd7ca77d58cd3d006f3c533a;hp=fbba46cde9afdc6bff0c4b337a22afc78d40fea7;hpb=a77f7d8228bcf1259f8c4121ce02d4763424d45a;p=urcu.git

diff --git a/urcu/static/urcu.h b/urcu/static/urcu.h
index fbba46c..3fb457b 100644
--- a/urcu/static/urcu.h
+++ b/urcu/static/urcu.h
@@ -224,6 +224,7 @@ static inline void _rcu_read_lock(void)
 	urcu_assert(URCU_TLS(rcu_reader).registered);
 	cmm_barrier();
 	tmp = URCU_TLS(rcu_reader).ctr;
+	urcu_assert((tmp & RCU_GP_CTR_NEST_MASK) != RCU_GP_CTR_NEST_MASK);
 	_rcu_read_lock_update(tmp);
 }
 
@@ -239,11 +240,11 @@ static inline void _rcu_read_unlock_update_and_wakeup(unsigned long tmp)
 {
 	if (caa_likely((tmp & RCU_GP_CTR_NEST_MASK) == RCU_GP_COUNT)) {
 		smp_mb_slave(RCU_MB_GROUP);
-		_CMM_STORE_SHARED(URCU_TLS(rcu_reader).ctr, URCU_TLS(rcu_reader).ctr - RCU_GP_COUNT);
+		_CMM_STORE_SHARED(URCU_TLS(rcu_reader).ctr, tmp - RCU_GP_COUNT);
 		smp_mb_slave(RCU_MB_GROUP);
 		wake_up_gp();
 	} else
-		_CMM_STORE_SHARED(URCU_TLS(rcu_reader).ctr, URCU_TLS(rcu_reader).ctr - RCU_GP_COUNT);
+		_CMM_STORE_SHARED(URCU_TLS(rcu_reader).ctr, tmp - RCU_GP_COUNT);
 }
 
 /*
@@ -257,6 +258,7 @@ static inline void _rcu_read_unlock(void)
 
 	urcu_assert(URCU_TLS(rcu_reader).registered);
 	tmp = URCU_TLS(rcu_reader).ctr;
+	urcu_assert(tmp & RCU_GP_CTR_NEST_MASK);
 	_rcu_read_unlock_update_and_wakeup(tmp);
 	cmm_barrier();	/* Ensure the compiler does not reorder us with mutex */
 }