diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-02 12:47:21 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-02 12:47:21 -0400 |
| commit | 4157fd85fc794bb7896b65c0cf686aa89d711d57 (patch) | |
| tree | 4ba3ebbea7bcaaa6d7a4ad1c5501c3c4a8d08745 /fs/xfs/linux-2.6 | |
| parent | e7c4f03b839ba4b64ce0a7c71d71a8e1b086c840 (diff) | |
| parent | 1b17d766463d51904cb242f194a780737e5f73ef (diff) | |
Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs
* 'for-linus' of git://oss.sgi.com/xfs/xfs:
xfs: prevent deadlock in xfs_qm_shake()
xfs: fix overflow in xfs_growfs_data_private
xfs: fix double unlock in xfs_swap_extents()
Diffstat (limited to 'fs/xfs/linux-2.6')
| -rw-r--r-- | fs/xfs/linux-2.6/kmem.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/xfs/linux-2.6/kmem.h b/fs/xfs/linux-2.6/kmem.h index af6843c7ee4b..179cbd630f69 100644 --- 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); | |||
| 103 | static inline int | 103 | static inline int |
| 104 | kmem_shake_allow(gfp_t gfp_mask) | 104 | kmem_shake_allow(gfp_t gfp_mask) |
| 105 | { | 105 | { |
| 106 | return (gfp_mask & __GFP_WAIT) != 0; | 106 | return ((gfp_mask & __GFP_WAIT) && (gfp_mask & __GFP_FS)); |
| 107 | } | 107 | } |
| 108 | 108 | ||
| 109 | #endif /* __XFS_SUPPORT_KMEM_H__ */ | 109 | #endif /* __XFS_SUPPORT_KMEM_H__ */ |