---

yaml --- r: 148835 b: refs/heads/master c: 4156e73 h: refs/heads/master i: 148833: f8933ce 148831: 2c559a9 v: v3
git-mirror · Jun 1, 2009 · 62a0e36 · 62a0e36
1 parent c2ea9e9
commit 62a0e36
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 096324873f9c7172a17aff9db1356f4f01b77afe
+refs/heads/master: 4156e735d3abde8e9243b5d22f7999dd3fffab2e
diff --git a/trunk/fs/xfs/linux-2.6/kmem.h b/trunk/fs/xfs/linux-2.6/kmem.h
@@ -103,7 +103,7 @@ extern void *kmem_zone_zalloc(kmem_zone_t *, unsigned int __nocast);
 static inline int
 kmem_shake_allow(gfp_t gfp_mask)
 {
-	return (gfp_mask & __GFP_WAIT) != 0;
+	return ((gfp_mask & __GFP_WAIT) && (gfp_mask & __GFP_FS));
 }
 
 #endif /* __XFS_SUPPORT_KMEM_H__ */