Message ID | 1340379312-6684-6-git-send-email-paulmck@linux.vnet.ibm.com |
---|---|
State | Accepted |
Commit | d1b88eb9e3bccaa43fb5d1bde1cbe210b3434731 |
Headers | show |
Paul E. McKenney <paulmck@linux.vnet.ibm.com> wrote: > From: "Paul E. McKenney" <paulmck@linux.vnet.ibm.com> > > The return value from RCU_INIT_POINTER() is not used, and using it > would be quite ugly, for example: > > q = RCU_INIT_POINTER(global_p, p); > > To prevent this sort of ugliness from appearing, this commit wraps > RCU_INIT_POINTER() in a do-while loop. > > Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com> > Reviewed-by: Josh Triplett <josh@joshtriplett.org> Acked-by: David Howells <dhowells@redhat.com>
diff --git a/include/linux/rcupdate.h b/include/linux/rcupdate.h index 88e4e08..267dc77 100644 --- a/include/linux/rcupdate.h +++ b/include/linux/rcupdate.h @@ -904,7 +904,9 @@ static inline notrace void rcu_read_unlock_sched_notrace(void) * the reader-accessible portions of the linked structure. */ #define RCU_INIT_POINTER(p, v) \ - p = (typeof(*v) __force __rcu *)(v) + do { \ + p = (typeof(*v) __force __rcu *)(v); \ + } while (0) /** * RCU_POINTER_INITIALIZER() - statically initialize an RCU protected pointer