Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e6cc1170 authored by Steffen Klassert's avatar Steffen Klassert Committed by Herbert Xu
Browse files

padata: Rename padata_alloc functions 



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: default avatarSteffen Klassert <steffen.klassert@secunet.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent cc74f4bc

crypto/pcrypt.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

include/linux/padata.h

+5 −4
Original line number Diff line number Diff line
@@ -165,8 +165,9 @@ 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,

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);

kernel/padata.c

+12 −12
Original line number Diff line number Diff line
@@ -1060,27 +1060,27 @@ 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,

struct padata_instance *padata_alloc(struct workqueue_struct *wq,

				     const struct cpumask *pcpumask,

				     const struct cpumask *cbcpumask)

{
@@ -1138,7 +1138,7 @@ err_free_inst: 
err:

	return NULL;

}

EXPORT_SYMBOL(__padata_alloc);

EXPORT_SYMBOL(padata_alloc);



/**

 * padata_free - free a padata instance