lkml.org 
[lkml]   [2010]   [Jul]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH 1/7] 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: Steffen Klassert <steffen.klassert@secunet.com>
    ---
    crypto/pcrypt.c | 2 +-
    include/linux/padata.h | 9 +++++----
    kernel/padata.c | 24 ++++++++++++------------
    3 files changed, 18 insertions(+), 17 deletions(-)

    diff --git a/crypto/pcrypt.c b/crypto/pcrypt.c
    index 794c172..5546083 100644
    --- a/crypto/pcrypt.c
    +++ b/crypto/pcrypt.c
    @@ -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;

    diff --git a/include/linux/padata.h b/include/linux/padata.h
    index 293ad46..71dfc9d 100644
    --- a/include/linux/padata.h
    +++ b/include/linux/padata.h
    @@ -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);
    diff --git a/kernel/padata.c b/kernel/padata.c
    index 7f895e2..12860bc 100644
    --- a/kernel/padata.c
    +++ b/kernel/padata.c
    @@ -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;
    @@ -1138,7 +1138,7 @@ err_free_inst:
    err:
    return NULL;
    }
    -EXPORT_SYMBOL(__padata_alloc);
    +EXPORT_SYMBOL(padata_alloc);

    /**
    * padata_free - free a padata instance
    --
    1.5.6.5


    \
     
     \ /
      Last update: 2010-07-27 07:13    [W:0.028 / U:30.064 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site