Skip to content

Commit

Permalink
padata: Rename padata_alloc functions
Browse files Browse the repository at this point in the history
We rename padata_alloc to padata_alloc_possible because this
function allocates a padata_instance and uses the cpu_possible
mask for parallel and serial workers. Also we rename __padata_alloc
to padata_alloc to avoid to export underlined functions. Underlined
functions are considered to be private to padata. Users are updated
accordingly.

Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
  • Loading branch information
klassert authored and herbertx committed Jul 31, 2010
1 parent cc74f4b commit e6cc117
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 17 deletions.
2 changes: 1 addition & 1 deletion crypto/pcrypt.c
Original file line number Diff line number Diff line change
Expand Up @@ -457,7 +457,7 @@ static int __pcrypt_init_instance(struct pcrypt_instance *pcrypt,
if (!pcrypt->wq)
goto err;

pcrypt->pinst = padata_alloc(pcrypt->wq);
pcrypt->pinst = padata_alloc_possible(pcrypt->wq);
if (!pcrypt->pinst)
goto err_destroy_workqueue;

Expand Down
9 changes: 5 additions & 4 deletions include/linux/padata.h
Original file line number Diff line number Diff line change
Expand Up @@ -165,10 +165,11 @@ struct padata_instance {
#define PADATA_INVALID 4
};

extern struct padata_instance *padata_alloc(struct workqueue_struct *wq);
extern struct padata_instance *__padata_alloc(struct workqueue_struct *wq,
const struct cpumask *pcpumask,
const struct cpumask *cbcpumask);
extern struct padata_instance *padata_alloc_possible(
struct workqueue_struct *wq);
extern struct padata_instance *padata_alloc(struct workqueue_struct *wq,
const struct cpumask *pcpumask,
const struct cpumask *cbcpumask);
extern void padata_free(struct padata_instance *pinst);
extern int padata_do_parallel(struct padata_instance *pinst,
struct padata_priv *padata, int cb_cpu);
Expand Down
24 changes: 12 additions & 12 deletions kernel/padata.c
Original file line number Diff line number Diff line change
Expand Up @@ -1060,29 +1060,29 @@ static struct kobj_type padata_attr_type = {
};

/**
* padata_alloc - Allocate and initialize padata instance.
* Use default cpumask(cpu_possible_mask)
* for serial and parallel workes.
* padata_alloc_possible - Allocate and initialize padata instance.
* Use the cpu_possible_mask for serial and
* parallel workers.
*
* @wq: workqueue to use for the allocated padata instance
*/
struct padata_instance *padata_alloc(struct workqueue_struct *wq)
struct padata_instance *padata_alloc_possible(struct workqueue_struct *wq)
{
return __padata_alloc(wq, cpu_possible_mask, cpu_possible_mask);
return padata_alloc(wq, cpu_possible_mask, cpu_possible_mask);
}
EXPORT_SYMBOL(padata_alloc);
EXPORT_SYMBOL(padata_alloc_possible);

/**
* __padata_alloc - allocate and initialize a padata instance
* and specify cpumasks for serial and parallel workers.
* padata_alloc - allocate and initialize a padata instance and specify
* cpumasks for serial and parallel workers.
*
* @wq: workqueue to use for the allocated padata instance
* @pcpumask: cpumask that will be used for padata parallelization
* @cbcpumask: cpumask that will be used for padata serialization
*/
struct padata_instance *__padata_alloc(struct workqueue_struct *wq,
const struct cpumask *pcpumask,
const struct cpumask *cbcpumask)
struct padata_instance *padata_alloc(struct workqueue_struct *wq,
const struct cpumask *pcpumask,
const struct cpumask *cbcpumask)
{
struct padata_instance *pinst;
struct parallel_data *pd = NULL;
Expand Down Expand Up @@ -1138,7 +1138,7 @@ struct padata_instance *__padata_alloc(struct workqueue_struct *wq,
err:
return NULL;
}
EXPORT_SYMBOL(__padata_alloc);
EXPORT_SYMBOL(padata_alloc);

/**
* padata_free - free a padata instance
Expand Down

0 comments on commit e6cc117

Please sign in to comment.