Browse Source

rcu: Remove return value from rcu_assign_pointer()

The return value from rcu_assign_pointer() is not used, and using it
would be quite ugly, for example:

	q = rcu_assign_pointer(global_p, p);

To prevent this sort of ugliness from spreading, this commit wraps
rcu_assign_pointer() in a do-while loop.

Reported-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Reported-by: Josh Triplett <josh@joshtriplett.org>
Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Reviewed-by: Josh Triplett <josh@joshtriplett.org>
Paul E. McKenney 13 years ago
parent
commit
e9023c4061
1 changed files with 3 additions and 3 deletions
  1. 3 3
      include/linux/rcupdate.h

+ 3 - 3
include/linux/rcupdate.h

@@ -513,10 +513,10 @@ static inline void rcu_preempt_sleep_check(void)
 		(_________p1); \
 		(_________p1); \
 	})
 	})
 #define __rcu_assign_pointer(p, v, space) \
 #define __rcu_assign_pointer(p, v, space) \
-	({ \
+	do { \
 		smp_wmb(); \
 		smp_wmb(); \
 		(p) = (typeof(*v) __force space *)(v); \
 		(p) = (typeof(*v) __force space *)(v); \
-	})
+	} while (0)
 
 
 
 
 /**
 /**
@@ -851,7 +851,7 @@ static inline notrace void rcu_read_unlock_sched_notrace(void)
  *
  *
  * Assigns the specified value to the specified RCU-protected
  * Assigns the specified value to the specified RCU-protected
  * pointer, ensuring that any concurrent RCU readers will see
  * pointer, ensuring that any concurrent RCU readers will see
- * any prior initialization.  Returns the value assigned.
+ * any prior initialization.
  *
  *
  * Inserts memory barriers on architectures that require them
  * Inserts memory barriers on architectures that require them
  * (which is most of them), and also prevents the compiler from
  * (which is most of them), and also prevents the compiler from