summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorJeff Dike <jdike@addtoit.com>2006-04-10 22:53:27 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-04-11 06:18:35 -0700
commit7b04d7170e9af805cac19f97b28fff10db897893 (patch)
treef4b0de67af631c1a1099bcd35621ae7fff38af67 /fs
parenta5d2f46a97cf8e23f5da17dec50a972642ac409f (diff)
downloadlinux-3.10-7b04d7170e9af805cac19f97b28fff10db897893.tar.gz
linux-3.10-7b04d7170e9af805cac19f97b28fff10db897893.tar.bz2
linux-3.10-7b04d7170e9af805cac19f97b28fff10db897893.zip
[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: Jeff Dike <jdike@addtoit.com> Acked-by: Nathan Scott <nathans@sgi.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'fs')
-rw-r--r--fs/xfs/linux-2.6/xfs_buf.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/xfs/linux-2.6/xfs_buf.c b/fs/xfs/linux-2.6/xfs_buf.c
index 9fb0312665c..26fed0756f0 100644
--- a/fs/xfs/linux-2.6/xfs_buf.c
+++ b/fs/xfs/linux-2.6/xfs_buf.c
@@ -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;