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)