lkml.org 
[lkml]   [2012]   [Apr]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 03/23] slab: rename gfpflags to allocflags
    Date
    A consistent name with slub saves us an acessor function.
    In both caches, this field represents the same thing. We would
    like to use it from the mem_cgroup code.

    Signed-off-by: Glauber Costa <glommer@parallels.com>
    ---
    include/linux/slab_def.h | 2 +-
    mm/slab.c | 10 +++++-----
    2 files changed, 6 insertions(+), 6 deletions(-)

    diff --git a/include/linux/slab_def.h b/include/linux/slab_def.h
    index fbd1117..d41effe 100644
    --- a/include/linux/slab_def.h
    +++ b/include/linux/slab_def.h
    @@ -39,7 +39,7 @@ struct kmem_cache {
    unsigned int gfporder;

    /* force GFP flags, e.g. GFP_DMA */
    - gfp_t gfpflags;
    + gfp_t allocflags;

    size_t colour; /* cache colouring range */
    unsigned int colour_off; /* colour offset */
    diff --git a/mm/slab.c b/mm/slab.c
    index e901a36..c6e5ab8 100644
    --- a/mm/slab.c
    +++ b/mm/slab.c
    @@ -1798,7 +1798,7 @@ static void *kmem_getpages(struct kmem_cache *cachep, gfp_t flags, int nodeid)
    flags |= __GFP_COMP;
    #endif

    - flags |= cachep->gfpflags;
    + flags |= cachep->allocflags;
    if (cachep->flags & SLAB_RECLAIM_ACCOUNT)
    flags |= __GFP_RECLAIMABLE;

    @@ -2508,9 +2508,9 @@ kmem_cache_create (const char *name, size_t size, size_t align,
    cachep->colour = left_over / cachep->colour_off;
    cachep->slab_size = slab_size;
    cachep->flags = flags;
    - cachep->gfpflags = 0;
    + cachep->allocflags = 0;
    if (CONFIG_ZONE_DMA_FLAG && (flags & SLAB_CACHE_DMA))
    - cachep->gfpflags |= GFP_DMA;
    + cachep->allocflags |= GFP_DMA;
    cachep->buffer_size = size;
    cachep->reciprocal_buffer_size = reciprocal_value(size);

    @@ -2857,9 +2857,9 @@ static void kmem_flagcheck(struct kmem_cache *cachep, gfp_t flags)
    {
    if (CONFIG_ZONE_DMA_FLAG) {
    if (flags & GFP_DMA)
    - BUG_ON(!(cachep->gfpflags & GFP_DMA));
    + BUG_ON(!(cachep->allocflags & GFP_DMA));
    else
    - BUG_ON(cachep->gfpflags & GFP_DMA);
    + BUG_ON(cachep->allocflags & GFP_DMA);
    }
    }

    --
    1.7.7.6


    \
     
     \ /
      Last update: 2012-04-21 00:03    [W:0.024 / U:0.580 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site