standardize rcu_gp_ongoing

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>

diff --git a/urcu-qsbr-static.h b/urcu-qsbr-static.h
index 7cef820d59fd7ff4223b0a9cc01f6834073d7b13..9f3a9b99f3c36ded7961cdeb3eadc102bba0f51d 100644 (file)
--- a/urcu-qsbr-static.h
+++ b/urcu-qsbr-static.h
@@ -156,24 +156,20 @@ static inline void wake_up_gp(void)
 }
 
 #if (BITS_PER_LONG < 64)
-static inline int rcu_gp_ongoing(unsigned long *value)
+static inline int rcu_gp_ongoing(unsigned long *ctr)
 {
-       unsigned long reader_gp;
+       unsigned long v;
 
-       if (value == NULL)
-               return 0;
-       reader_gp = LOAD_SHARED(*value);
-       return reader_gp && ((reader_gp ^ rcu_gp_ctr) & RCU_GP_CTR);
+       v = LOAD_SHARED(*ctr);
+       return v && ((v ^ rcu_gp_ctr) & RCU_GP_CTR);
 }
 #else /* !(BITS_PER_LONG < 64) */
-static inline int rcu_gp_ongoing(unsigned long *value)
+static inline int rcu_gp_ongoing(unsigned long *ctr)
 {
-       unsigned long reader_gp;
+       unsigned long v;
 
-       if (value == NULL)
-               return 0;
-       reader_gp = LOAD_SHARED(*value);
-       return reader_gp && (reader_gp - rcu_gp_ctr > ULONG_MAX / 2);
+       v = LOAD_SHARED(*ctr);
+       return v && (v - rcu_gp_ctr > ULONG_MAX / 2);
 }
 #endif  /* !(BITS_PER_LONG < 64) */
 

diff --git a/urcu-static.h b/urcu-static.h
index 1eeb2e6b03319c313d051ef71a3148add48ff264..504febb7cd51059b8c258540955620f4f14449a9 100644 (file)
--- a/urcu-static.h
+++ b/urcu-static.h
@@ -242,17 +242,15 @@ static inline void wake_up_gp(void)
        }
 }
 
-static inline int rcu_gp_ongoing(unsigned long *value)
+static inline int rcu_gp_ongoing(unsigned long *ctr)
 {
        unsigned long v;
 
-       if (value == NULL)
-               return 0;
        /*
         * Make sure both tests below are done on the same version of *value
         * to insure consistency.
         */
-       v = LOAD_SHARED(*value);
+       v = LOAD_SHARED(*ctr);
        return (v & RCU_GP_CTR_NEST_MASK) &&
                 ((v ^ rcu_gp_ctr) & RCU_GP_CTR_PHASE);
 }