padata: remove reorder_objects

reorder_objects is unused since the rework of padata's flushing, so
remove it.

Signed-off-by: Daniel Jordan <daniel.m.jordan@oracle.com>
Cc: Eric Biggers <ebiggers@kernel.org>
Cc: Herbert Xu <herbert@gondor.apana.org.au>
Cc: Steffen Klassert <steffen.klassert@secunet.com>
Cc: linux-crypto@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

diff --git a/include/linux/padata.h b/include/linux/padata.h
index 178d5cc6b49408340ffead191df6025ff725479b..faa2e36832f8d78f576e10e9f355904c06610389 100644 (file)
--- a/include/linux/padata.h
+++ b/include/linux/padata.h
@@ -101,7 +101,6 @@ struct padata_cpumask {
  * @sh: padata_shell object.
  * @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.
  * @max_seq_nr:  Maximal used sequence number.
  * @processed: Number of already processed objects.
@@ -114,7 +113,6 @@ struct parallel_data {
        struct padata_shell             *ps;
        struct padata_parallel_queue    __percpu *pqueue;
        struct padata_serial_queue      __percpu *squeue;
-       atomic_t                        reorder_objects;
        atomic_t                        refcnt;
        atomic_t                        seq_nr;
        unsigned int                    processed;

diff --git a/kernel/padata.c b/kernel/padata.c
index bc594c00b26efb6bf30e5c33c3c5294cec76e3bf..db950d287b3dc35635edc35763d001c2d04fbaaa 100644 (file)
--- a/kernel/padata.c
+++ b/kernel/padata.c
@@ -202,7 +202,6 @@ static struct padata_priv *padata_find_next(struct parallel_data *pd,
 
        if (remove_object) {
                list_del_init(&padata->list);
-               atomic_dec(&pd->reorder_objects);
                ++pd->processed;
                pd->cpu = cpumask_next_wrap(cpu, pd->cpumask.pcpu, -1, false);
        }
@@ -336,7 +335,6 @@ void padata_do_serial(struct padata_priv *padata)
                if (cur->seq_nr < padata->seq_nr)
                        break;
        list_add(&padata->list, &cur->list);
-       atomic_inc(&pd->reorder_objects);
        spin_unlock(&pqueue->reorder.lock);
 
        /*
@@ -455,7 +453,6 @@ static struct parallel_data *padata_alloc_pd(struct padata_shell *ps)
        padata_init_pqueues(pd);
        padata_init_squeues(pd);
        atomic_set(&pd->seq_nr, -1);
-       atomic_set(&pd->reorder_objects, 0);
        atomic_set(&pd->refcnt, 1);
        spin_lock_init(&pd->lock);
        pd->cpu = cpumask_first(pd->cpumask.pcpu);