reorder_objects is unused since the rework of padata's flushing, so remove it.
Unified · Split
| @@ -101,7 +101,6 @@ struct padata_cpumask { · 100 unmodified lines | |||
| 101 | * @sh: padata_shell object. | 101 | * @sh: padata_shell object. |
| 102 | * @pqueue: percpu padata queues used for parallelization. | 102 | * @pqueue: percpu padata queues used for parallelization. |
| 103 | * @squeue: percpu padata queues used for serialuzation. | 103 | * @squeue: percpu padata queues used for serialuzation. |
| 104 | * @reorder_objects: Number of objects waiting in the reorder queues. | ||
| 105 | * @refcnt: Number of objects holding a reference on this parallel_data. | 104 | * @refcnt: Number of objects holding a reference on this parallel_data. |
| 106 | * @max_seq_nr: Maximal used sequence number. | 105 | * @max_seq_nr: Maximal used sequence number. |
| 107 | * @processed: Number of already processed objects. | 106 | * @processed: Number of already processed objects. |
| @@ -114,7 +113,6 @@ struct parallel_data { · 6 unmodified lines | |||
| 114 | struct padata_shell *ps; | 113 | struct padata_shell *ps; |
| 115 | struct padata_parallel_queue __percpu *pqueue; | 114 | struct padata_parallel_queue __percpu *pqueue; |
| 116 | struct padata_serial_queue __percpu *squeue; | 115 | struct padata_serial_queue __percpu *squeue; |
| 117 | atomic_t reorder_objects; | ||
| 118 | atomic_t refcnt; | 116 | atomic_t refcnt; |
| 119 | atomic_t seq_nr; | 117 | atomic_t seq_nr; |
| 120 | unsigned int processed; | 118 | unsigned int processed; |
| @@ -202,7 +202,6 @@ static struct padata_priv *padata_find_next(struct parallel_data *pd, · 201 unmodified lines | |||
| 202 | 202 | ||
| 203 | if (remove_object) { | 203 | if (remove_object) { |
| 204 | list_del_init(&padata->list); | 204 | list_del_init(&padata->list); |
| 205 | atomic_dec(&pd->reorder_objects); | ||
| 206 | ++pd->processed; | 205 | ++pd->processed; |
| 207 | pd->cpu = cpumask_next_wrap(cpu, pd->cpumask.pcpu, -1, false); | 206 | pd->cpu = cpumask_next_wrap(cpu, pd->cpumask.pcpu, -1, false); |
| 208 | } | 207 | } |
| @@ -336,7 +335,6 @@ void padata_do_serial(struct padata_priv *padata) · 127 unmodified lines | |||
| 336 | if (cur->seq_nr < padata->seq_nr) | 335 | if (cur->seq_nr < padata->seq_nr) |
| 337 | break; | 336 | break; |
| 338 | list_add(&padata->list, &cur->list); | 337 | list_add(&padata->list, &cur->list); |
| 339 | atomic_inc(&pd->reorder_objects); | ||
| 340 | spin_unlock(&pqueue->reorder.lock); | 338 | spin_unlock(&pqueue->reorder.lock); |
| 341 | 339 | ||
| 342 | /* | 340 | /* |
| @@ -455,7 +453,6 @@ static struct parallel_data *padata_alloc_pd(struct padata_shell *ps) · 112 unmodified lines | |||
| 455 | padata_init_pqueues(pd); | 453 | padata_init_pqueues(pd); |
| 456 | padata_init_squeues(pd); | 454 | padata_init_squeues(pd); |
| 457 | atomic_set(&pd->seq_nr, -1); | 455 | atomic_set(&pd->seq_nr, -1); |
| 458 | atomic_set(&pd->reorder_objects, 0); | ||
| 459 | atomic_set(&pd->refcnt, 1); | 456 | atomic_set(&pd->refcnt, 1); |
| 460 | spin_lock_init(&pd->lock); | 457 | spin_lock_init(&pd->lock); |
| 461 | pd->cpu = cpumask_first(pd->cpumask.pcpu); | 458 | pd->cpu = cpumask_first(pd->cpumask.pcpu); |