reorder_objects is unused since the rework of padata's flushing, so remove it. Signed-off-by: Daniel Jordan <daniel.m.jordan@xxxxxxxxxx> Cc: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx> Cc: Sebastian Andrzej Siewior <bigeasy@xxxxxxxxxxxxx> Cc: Steffen Klassert <steffen.klassert@xxxxxxxxxxx> Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx> Cc: linux-crypto@xxxxxxxxxxxxxxx Cc: linux-kernel@xxxxxxxxxxxxxxx --- include/linux/padata.h | 2 -- kernel/padata.c | 3 --- 2 files changed, 5 deletions(-) diff --git a/include/linux/padata.h b/include/linux/padata.h index 1c73f9cc7b72..720e970cda0a 100644 --- a/include/linux/padata.h +++ b/include/linux/padata.h @@ -103,7 +103,6 @@ struct padata_cpumask { * @pinst: padata instance. * @pqueue: percpu padata queues used for parallelization. * @squeue: percpu padata queues used for serialuzation. - * @reorder_objects: Number of objects waiting in the reorder queues. * @refcnt: Number of objects holding a reference on this parallel_data. * @flushing_done: Wait for all objects to be sent out. * @max_seq_nr: Maximal used sequence number. @@ -116,7 +115,6 @@ struct parallel_data { struct padata_instance *pinst; struct padata_parallel_queue __percpu *pqueue; struct padata_serial_queue __percpu *squeue; - atomic_t reorder_objects; atomic_t refcnt; struct completion flushing_done; atomic_t seq_nr; diff --git a/kernel/padata.c b/kernel/padata.c index 958166e23123..2bfce01c5b85 100644 --- a/kernel/padata.c +++ b/kernel/padata.c @@ -179,7 +179,6 @@ static struct padata_priv *padata_get_next(struct parallel_data *pd) struct padata_priv, list); list_del_init(&padata->list); - atomic_dec(&pd->reorder_objects); pd->cpu = cpumask_next_wrap(cpu, pd->cpumask.pcpu, -1, false); @@ -323,7 +322,6 @@ void padata_do_serial(struct padata_priv *padata) spin_lock(&pqueue->reorder.lock); list_add_tail(&padata->list, &pqueue->reorder.list); - atomic_inc(&pd->reorder_objects); spin_unlock(&pqueue->reorder.lock); /* @@ -423,7 +421,6 @@ static struct parallel_data *padata_alloc_pd(struct padata_instance *pinst, padata_init_pqueues(pd); padata_init_squeues(pd); atomic_set(&pd->seq_nr, -1); - atomic_set(&pd->reorder_objects, 0); /* Initial ref dropped in padata_flush_queues. */ atomic_set(&pd->refcnt, 1); init_completion(&pd->flushing_done); -- 2.23.0