lkml.org 
[lkml]   [2015]   [May]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 20/51] writeback: add @gfp to wb_init()
    Date
    wb_init() currently always uses GFP_KERNEL but the planned cgroup
    writeback support needs using other allocation masks. Add @gfp to
    wb_init().

    This patch doesn't introduce any behavior changes.

    Signed-off-by: Tejun Heo <tj@kernel.org>
    Reviewed-by: Jan Kara <jack@suse.cz>
    Cc: Jens Axboe <axboe@kernel.dk>
    ---
    mm/backing-dev.c | 9 +++++----
    1 file changed, 5 insertions(+), 4 deletions(-)

    diff --git a/mm/backing-dev.c b/mm/backing-dev.c
    index b0707d1..805b287 100644
    --- a/mm/backing-dev.c
    +++ b/mm/backing-dev.c
    @@ -291,7 +291,8 @@ void wb_wakeup_delayed(struct bdi_writeback *wb)
    */
    #define INIT_BW (100 << (20 - PAGE_SHIFT))

    -static int wb_init(struct bdi_writeback *wb, struct backing_dev_info *bdi)
    +static int wb_init(struct bdi_writeback *wb, struct backing_dev_info *bdi,
    + gfp_t gfp)
    {
    int i, err;

    @@ -315,12 +316,12 @@ static int wb_init(struct bdi_writeback *wb, struct backing_dev_info *bdi)
    INIT_LIST_HEAD(&wb->work_list);
    INIT_DELAYED_WORK(&wb->dwork, wb_workfn);

    - err = fprop_local_init_percpu(&wb->completions, GFP_KERNEL);
    + err = fprop_local_init_percpu(&wb->completions, gfp);
    if (err)
    return err;

    for (i = 0; i < NR_WB_STAT_ITEMS; i++) {
    - err = percpu_counter_init(&wb->stat[i], 0, GFP_KERNEL);
    + err = percpu_counter_init(&wb->stat[i], 0, gfp);
    if (err) {
    while (--i)
    percpu_counter_destroy(&wb->stat[i]);
    @@ -378,7 +379,7 @@ int bdi_init(struct backing_dev_info *bdi)
    bdi->max_prop_frac = FPROP_FRAC_BASE;
    INIT_LIST_HEAD(&bdi->bdi_list);

    - err = wb_init(&bdi->wb, bdi);
    + err = wb_init(&bdi->wb, bdi, GFP_KERNEL);
    if (err)
    return err;

    --
    2.4.0


    \
     
     \ /
      Last update: 2015-05-23 00:01    [W:8.832 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site