Web lists-archives.com

Re: [PATCH] rcuperf: fix duplicate struct initializer




On Wed, Apr 19, 2017 at 07:14:34PM +0200, Arnd Bergmann wrote:
> Building with "make W=1" shows a set of new warnings in the rcuperf code:
> 
> kernel/rcu/rcuperf.c:282:11: error: initialized field overwritten [-Werror=override-init]
>   .async  = srcu_call_rcu,
> kernel/rcu/rcuperf.c:282:11: note: (near initialization for 'sched_ops.async')
> kernel/rcu/rcuperf.c:283:16: error: initialized field overwritten [-Werror=override-init]
>   .gp_barrier = srcu_rcu_barrier,
> kernel/rcu/rcuperf.c:283:16: note: (near initialization for 'sched_ops.gp_barrier')
> kernel/rcu/rcuperf.c:313:11: error: initialized field overwritten [-Werror=override-init]
>   .async  = call_rcu_tasks,
> kernel/rcu/rcuperf.c:313:11: note: (near initialization for 'tasks_ops.async')
> kernel/rcu/rcuperf.c:314:16: error: initialized field overwritten [-Werror=override-init]
>   .gp_barrier = rcu_barrier_tasks,
> kernel/rcu/rcuperf.c:314:16: note: (near initialization for 'tasks_ops.gp_barrier')
> 
> This appears to be a copy-paste bug, so we can remove the extranous copy.
> 
> Fixes: f743d20f2cc6 ("rcuperf: Add ability to performance-test call_rcu() and friends")
> Signed-off-by: Arnd Bergmann <arnd@xxxxxxxx>

For those times when you want to be -really- sure that the field is in
fact initialized!  ;-)

Good catch!!!  I merged this into the original commit with attribution:

[ paulmck: Removed the redundant initialization noted by Arnd Bergmann. ]

							Thanx, Paul

> ---
>  kernel/rcu/rcuperf.c | 4 ----
>  1 file changed, 4 deletions(-)
> 
> diff --git a/kernel/rcu/rcuperf.c b/kernel/rcu/rcuperf.c
> index 329010a41f30..e1ce97bead94 100644
> --- a/kernel/rcu/rcuperf.c
> +++ b/kernel/rcu/rcuperf.c
> @@ -279,8 +279,6 @@ static struct rcu_perf_ops sched_ops = {
>  	.exp_completed	= rcu_exp_batches_completed_sched,
>  	.async		= call_rcu_sched,
>  	.gp_barrier	= rcu_barrier_sched,
> -	.async		= srcu_call_rcu,
> -	.gp_barrier	= srcu_rcu_barrier,
>  	.sync		= synchronize_sched,
>  	.exp_sync	= synchronize_sched_expedited,
>  	.name		= "sched"
> @@ -310,8 +308,6 @@ static struct rcu_perf_ops tasks_ops = {
>  	.completed	= rcu_no_completed,
>  	.async		= call_rcu_tasks,
>  	.gp_barrier	= rcu_barrier_tasks,
> -	.async		= call_rcu_tasks,
> -	.gp_barrier	= rcu_barrier_tasks,
>  	.sync		= synchronize_rcu_tasks,
>  	.exp_sync	= synchronize_rcu_tasks,
>  	.name		= "tasks"
> -- 
> 2.9.0
>