diff mbox

[3.5.y.z,extended,stable] Linux 3.5.7.25

Message ID 1383231096-11941-2-git-send-email-luis.henriques@canonical.com
State New
Headers show

Commit Message

Luis Henriques Oct. 31, 2013, 2:51 p.m. UTC
diff mbox

Patch

diff --git a/Makefile b/Makefile
index f51c204..e753078 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@ 
 VERSION = 3
 PATCHLEVEL = 5
 SUBLEVEL = 7
-EXTRAVERSION = .24
+EXTRAVERSION = .25
 NAME = Saber-toothed Squirrel
 
 # *DOCUMENTATION*
diff --git a/fs/buffer.c b/fs/buffer.c
index 2675e5a..2c78739 100644
--- a/fs/buffer.c
+++ b/fs/buffer.c
@@ -957,19 +957,9 @@  grow_dev_page(struct block_device *bdev, sector_t block,
 	struct buffer_head *bh;
 	sector_t end_block;
 	int ret = 0;		/* Will call free_more_memory() */
-	gfp_t gfp_mask;
 
-	gfp_mask = mapping_gfp_mask(inode->i_mapping) & ~__GFP_FS;
-	gfp_mask |= __GFP_MOVABLE;
-	/*
-	 * XXX: __getblk_slow() can not really deal with failure and
-	 * will endlessly loop on improvised global reclaim.  Prefer
-	 * looping in the allocator rather than here, at least that
-	 * code knows what it's doing.
-	 */
-	gfp_mask |= __GFP_NOFAIL;
-
-	page = find_or_create_page(inode->i_mapping, index, gfp_mask);
+	page = find_or_create_page(inode->i_mapping, index,
+		(mapping_gfp_mask(inode->i_mapping) & ~__GFP_FS)|__GFP_MOVABLE);
 	if (!page)
 		return ret;
 
diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index 953bf3c..226b63e 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -2405,8 +2405,6 @@  done:
 	return 0;
 nomem:
 	*ptr = NULL;
-	if (gfp_mask & __GFP_NOFAIL)
-		return 0;
 	return -ENOMEM;
 bypass:
 	*ptr = root_mem_cgroup;