diff --git a/[refs] b/[refs]
index 6f116800e462..5fc9fe8e8e25 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6bd5e82b099c3d633905098b3c0af808ced73d85
+refs/heads/master: 0c59a95d90081e5d840649d4f872027123e3420c
diff --git a/trunk/fs/fscache/page.c b/trunk/fs/fscache/page.c
index 4882c806253f..42f8f2d8a197 100644
--- a/trunk/fs/fscache/page.c
+++ b/trunk/fs/fscache/page.c
@@ -109,7 +109,7 @@ bool __fscache_maybe_release_page(struct fscache_cookie *cookie,
 	 * allocator as the work threads writing to the cache may all end up
 	 * sleeping on memory allocation, so we may need to impose a timeout
 	 * too. */
-	if (!(gfp & __GFP_WAIT)) {
+	if (!(gfp & __GFP_WAIT) || !(gfp & __GFP_FS)) {
 		fscache_stat(&fscache_n_store_vmscan_busy);
 		return false;
 	}