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

Commit 7b04d717 authored by Jeff Dike's avatar Jeff Dike Committed by Linus Torvalds
Browse files

[PATCH] Add GFP_NOWAIT 



Introduce GFP_NOWAIT, as an alias for GFP_ATOMIC & ~__GFP_HIGH.

This also changes XFS, which is the only in-tree user of this idiom that I
could find.  The XFS piece is compile-tested only.

Signed-off-by: default avatarJeff Dike <jdike@addtoit.com>
Acked-by: default avatarNathan Scott <nathans@sgi.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent a5d2f46a

fs/xfs/linux-2.6/xfs_buf.c

+1 −1
Original line number Diff line number Diff line
@@ -182,7 +182,7 @@ free_address( 
{

	a_list_t	*aentry;



	aentry = kmalloc(sizeof(a_list_t), GFP_ATOMIC & ~__GFP_HIGH);

	aentry = kmalloc(sizeof(a_list_t), GFP_NOWAIT);

	if (likely(aentry)) {

		spin_lock(&as_lock);

		aentry->next = as_free_head;

include/linux/gfp.h

+2 −0
Original line number Diff line number Diff line
@@ -57,6 +57,8 @@ struct vm_area_struct; 
			__GFP_NOFAIL|__GFP_NORETRY|__GFP_NO_GROW|__GFP_COMP| \

			__GFP_NOMEMALLOC|__GFP_HARDWALL)



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

#define GFP_NOWAIT	(GFP_ATOMIC & ~__GFP_HIGH)

/* GFP_ATOMIC means both !wait (__GFP_WAIT not set) and use emergency pool */

#define GFP_ATOMIC	(__GFP_HIGH)

#define GFP_NOIO	(__GFP_WAIT)