git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'topic/usb-audio' into for-linus
[pandora-kernel.git]
/
fs
/
xfs
/
linux-2.6
/
kmem.h
diff --git
a/fs/xfs/linux-2.6/kmem.h
b/fs/xfs/linux-2.6/kmem.h
index
af6843c
..
179cbd6
100644
(file)
--- a/
fs/xfs/linux-2.6/kmem.h
+++ b/
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)
{
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__ */
}
#endif /* __XFS_SUPPORT_KMEM_H__ */