diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2005-10-21 03:22:44 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-28 08:16:51 -0700 |
| commit | 260b23674fdb570f3235ce55892246bef1c24c2a (patch) | |
| tree | 471e7b546cbf1f7ee4a165e5bd9a2de0770e53be /include/linux/pagemap.h | |
| parent | c4cdd038318863e912e9b992489f61497f98b442 (diff) | |
| download | blackbird-op-linux-260b23674fdb570f3235ce55892246bef1c24c2a.tar.gz blackbird-op-linux-260b23674fdb570f3235ce55892246bef1c24c2a.zip | |
[PATCH] gfp_t: the rest
zone handling, mapping->flags handling
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include/linux/pagemap.h')
| -rw-r--r-- | include/linux/pagemap.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/include/linux/pagemap.h b/include/linux/pagemap.h index efbae53fb078..ba6c310a055f 100644 --- a/include/linux/pagemap.h +++ b/include/linux/pagemap.h @@ -21,16 +21,17 @@ static inline gfp_t mapping_gfp_mask(struct address_space * mapping) { - return mapping->flags & __GFP_BITS_MASK; + return (__force gfp_t)mapping->flags & __GFP_BITS_MASK; } /* * This is non-atomic. Only to be used before the mapping is activated. * Probably needs a barrier... */ -static inline void mapping_set_gfp_mask(struct address_space *m, int mask) +static inline void mapping_set_gfp_mask(struct address_space *m, gfp_t mask) { - m->flags = (m->flags & ~__GFP_BITS_MASK) | mask; + m->flags = (m->flags & ~(__force unsigned long)__GFP_BITS_MASK) | + (__force unsigned long)mask; } /* |
