From f5e194b0facdc46d800f8713f3cb63f092187ca7 Mon Sep 17 00:00:00 2001
From: Mel Gorman <mgorman@suse.de>
Date: Mon, 31 Oct 2011 17:07:48 -0700
Subject: [PATCH] --- yaml --- r: 272127 b: refs/heads/master c:
 966dbde2c208e07bab7a45a7855e1e693eabe661 h: refs/heads/master i:   272125:
 63007d3aa5be82add9fade3fdae4046902b9c149   272123:
 0c27f3f342ede04e37bebd01cec87da12414f3f2   272119:
 b409a0ac7848710b2a03dd311dd30b8b8e446aa5   272111:
 2801ddf62657fff490df10c00f01206ff807457d   272095:
 077e9f2df20826bf3e2573baa982804e350a0b1c   272063:
 85aeef4b48490d269016e0ce7cf28432dce905db   271999:
 4e30b8318ec9359306401c718439f8d8485f6712   271871:
 ccf9a98a8cbbb49efdc583fbae045b244025f890 v: v3

---
 [refs]                | 2 +-
 trunk/fs/ext4/inode.c | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 037c1b35a7bc..898a6f7c72d5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 94054fa3fca1fd78db02cb3d68d5627120f0a1d4
+refs/heads/master: 966dbde2c208e07bab7a45a7855e1e693eabe661
diff --git a/trunk/fs/ext4/inode.c b/trunk/fs/ext4/inode.c
index 986e2388f031..0defe0bfe019 100644
--- a/trunk/fs/ext4/inode.c
+++ b/trunk/fs/ext4/inode.c
@@ -1811,8 +1811,12 @@ static int ext4_writepage(struct page *page,
 		 * We don't want to do block allocation, so redirty
 		 * the page and return.  We may reach here when we do
 		 * a journal commit via journal_submit_inode_data_buffers.
-		 * We can also reach here via shrink_page_list
+		 * We can also reach here via shrink_page_list but it
+		 * should never be for direct reclaim so warn if that
+		 * happens
 		 */
+		WARN_ON_ONCE((current->flags & (PF_MEMALLOC|PF_KSWAPD)) ==
+								PF_MEMALLOC);
 		goto redirty_page;
 	}
 	if (commit_write)