On Wed, 7 May 2014, Joonsoo Kim wrote:
> Factor out initialization of array cache to use it in following patch.
>
> Acked-by: Christoph Lameter <cl@xxxxxxxxx>
> Signed-off-by: Joonsoo Kim <iamjoonsoo.kim@xxxxxxx>
>
Acked-by: David Rientjes <rientjes@xxxxxxxxxx>
s/arracy/array/ in patch title.
> diff --git a/mm/slab.c b/mm/slab.c
> index 7647728..755fb57 100644
> --- a/mm/slab.c
> +++ b/mm/slab.c
> @@ -741,13 +741,8 @@ static void start_cpu_timer(int cpu)
> }
> }
>
> -static struct array_cache *alloc_arraycache(int node, int entries,
> - int batchcount, gfp_t gfp)
> +static void init_arraycache(struct array_cache *ac, int limit, int batch)
> {
> - int memsize = sizeof(void *) * entries + sizeof(struct array_cache);
> - struct array_cache *nc = NULL;
> -
> - nc = kmalloc_node(memsize, gfp, node);
> /*
> * The array_cache structures contain pointers to free object.
> * However, when such objects are allocated or transferred to another
> @@ -755,15 +750,25 @@ static struct array_cache *alloc_arraycache(int node, int entries,
> * valid references during a kmemleak scan. Therefore, kmemleak must
> * not scan such objects.
> */
> - kmemleak_no_scan(nc);
> - if (nc) {
> - nc->avail = 0;
> - nc->limit = entries;
> - nc->batchcount = batchcount;
> - nc->touched = 0;
> - spin_lock_init(&nc->lock);
> + kmemleak_no_scan(ac);
> + if (ac) {
> + ac->avail = 0;
> + ac->limit = limit;
> + ac->batchcount = batch;
> + ac->touched = 0;
> + spin_lock_init(&ac->lock);
> }
> - return nc;
> +}
> +
> +static struct array_cache *alloc_arraycache(int node, int entries,
> + int batchcount, gfp_t gfp)
> +{
> + int memsize = sizeof(void *) * entries + sizeof(struct array_cache);
const?
> + struct array_cache *ac = NULL;
> +
> + ac = kmalloc_node(memsize, gfp, node);
I thought nc meant node cache, but I agree that ac is clearer.
> + init_arraycache(ac, entries, batchcount);
> + return ac;
> }
>
> static inline bool is_slab_pfmemalloc(struct page *page)
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@xxxxxxxxx. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@xxxxxxxxx";> email@xxxxxxxxx </a>