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

Commit cfce6604 authored by Christoph Lameter's avatar Christoph Lameter Committed by Linus Torvalds
Browse files

Slab allocators: remove useless __GFP_NO_GROW flag 



There is no user remaining and I have never seen any use of that flag.

Signed-off-by: default avatarChristoph Lameter <clameter@sgi.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 4f104934

include/linux/gfp.h

+1 −2
Original line number Diff line number Diff line
@@ -40,7 +40,6 @@ struct vm_area_struct; 
#define __GFP_REPEAT	((__force gfp_t)0x400u)	/* Retry the allocation.  Might fail */

#define __GFP_NOFAIL	((__force gfp_t)0x800u)	/* Retry for ever.  Cannot fail */

#define __GFP_NORETRY	((__force gfp_t)0x1000u)/* Do not retry.  Might fail */

#define __GFP_NO_GROW	((__force gfp_t)0x2000u)/* Slab internal usage */

#define __GFP_COMP	((__force gfp_t)0x4000u)/* Add compound page metadata */

#define __GFP_ZERO	((__force gfp_t)0x8000u)/* Return zeroed page on success */

#define __GFP_NOMEMALLOC ((__force gfp_t)0x10000u) /* Don't use emergency reserves */
@@ -53,7 +52,7 @@ struct vm_area_struct; 
/* if you forget to add the bitmask here kernel will crash, period */

#define GFP_LEVEL_MASK (__GFP_WAIT|__GFP_HIGH|__GFP_IO|__GFP_FS| \

			__GFP_COLD|__GFP_NOWARN|__GFP_REPEAT| \

			__GFP_NOFAIL|__GFP_NORETRY|__GFP_NO_GROW|__GFP_COMP| \

			__GFP_NOFAIL|__GFP_NORETRY|__GFP_COMP| \

			__GFP_NOMEMALLOC|__GFP_HARDWALL|__GFP_THISNODE)



/* This equals 0, but use constants in case they ever change */

mm/slab.c

+2 −4
Original line number Diff line number Diff line
@@ -2746,9 +2746,7 @@ static int cache_grow(struct kmem_cache *cachep, 
	 * Be lazy and only check for valid flags here,  keeping it out of the

	 * critical path in kmem_cache_alloc().

	 */

	BUG_ON(flags & ~(GFP_DMA | GFP_LEVEL_MASK | __GFP_NO_GROW));

	if (flags & __GFP_NO_GROW)

		return 0;

	BUG_ON(flags & ~(GFP_DMA | GFP_LEVEL_MASK));



	ctor_flags = SLAB_CTOR_CONSTRUCTOR;

	local_flags = (flags & GFP_LEVEL_MASK);
@@ -3252,7 +3250,7 @@ static void *fallback_alloc(struct kmem_cache *cache, gfp_t flags) 
					flags | GFP_THISNODE, nid);

	}



	if (!obj && !(flags & __GFP_NO_GROW)) {

	if (!obj) {

		/*

		 * This allocation will be performed within the constraints

		 * of the current cpuset / memory policy requirements.

mm/slub.c

+0 −3
Original line number Diff line number Diff line
@@ -815,9 +815,6 @@ static struct page *new_slab(struct kmem_cache *s, gfp_t flags, int node) 
	void *last;

	void *p;



	if (flags & __GFP_NO_GROW)

		return NULL;



	BUG_ON(flags & ~(GFP_DMA | GFP_LEVEL_MASK));



	if (flags & __GFP_WAIT)