From 3ebbf96827f7ebc5fbb6c017c83da50b7240bc88 Mon Sep 17 00:00:00 2001
From: Christoph Lameter <clameter@sgi.com>
Date: Wed, 16 May 2007 22:11:21 -0700
Subject: [PATCH] --- yaml --- r: 56537 b: refs/heads/master c:
 ea125892a17f43919c726777ed1e4929d41e7984 h: refs/heads/master i:   56535:
 8e07c4b04fffa38f99c6179566c4fdc724ad8822 v: v3

---
 [refs]            | 2 +-
 trunk/fs/buffer.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 42b1c271af40..3d9a6ffb402b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8d98a690f58e0d6ecf424b7ca84488475cf87bd9
+refs/heads/master: ea125892a17f43919c726777ed1e4929d41e7984
diff --git a/trunk/fs/buffer.c b/trunk/fs/buffer.c
index 3deeb886f6e6..49590d590d7d 100644
--- a/trunk/fs/buffer.c
+++ b/trunk/fs/buffer.c
@@ -981,7 +981,8 @@ grow_dev_page(struct block_device *bdev, sector_t block,
 	struct page *page;
 	struct buffer_head *bh;
 
-	page = find_or_create_page(inode->i_mapping, index, GFP_NOFS);
+	page = find_or_create_page(inode->i_mapping, index,
+		mapping_gfp_mask(inode->i_mapping) & ~__GFP_FS);
 	if (!page)
 		return NULL;