---

yaml --- r: 272127 b: refs/heads/master c: 966dbde h: refs/heads/master i: 272125: 63007d3 272123: 0c27f3f 272119: b409a0a 272111: 2801ddf 272095: 077e9f2 272063: 85aeef4 271999: 4e30b83 271871: ccf9a98 v: v3
git-mirror · Nov 1, 2011 · f5e194b · f5e194b
1 parent fc99ba9
commit f5e194b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git 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
@@ -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)