Commit 20241ad4 authored by Al Viro's avatar Al Viro Committed by Linus Torvalds

[PATCH] gfp annotations: radix_tree_root

struct radix_tree_root has unused upper bits of ->gfp_mask reused for
tags bitmap.  Annotated.
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent fa1f5ea8
...@@ -160,13 +160,13 @@ static inline int tag_get(struct radix_tree_node *node, unsigned int tag, ...@@ -160,13 +160,13 @@ static inline int tag_get(struct radix_tree_node *node, unsigned int tag,
static inline void root_tag_set(struct radix_tree_root *root, unsigned int tag) static inline void root_tag_set(struct radix_tree_root *root, unsigned int tag)
{ {
root->gfp_mask |= (1 << (tag + __GFP_BITS_SHIFT)); root->gfp_mask |= (__force gfp_t)(1 << (tag + __GFP_BITS_SHIFT));
} }
static inline void root_tag_clear(struct radix_tree_root *root, unsigned int tag) static inline void root_tag_clear(struct radix_tree_root *root, unsigned int tag)
{ {
root->gfp_mask &= ~(1 << (tag + __GFP_BITS_SHIFT)); root->gfp_mask &= (__force gfp_t)~(1 << (tag + __GFP_BITS_SHIFT));
} }
static inline void root_tag_clear_all(struct radix_tree_root *root) static inline void root_tag_clear_all(struct radix_tree_root *root)
...@@ -176,7 +176,7 @@ static inline void root_tag_clear_all(struct radix_tree_root *root) ...@@ -176,7 +176,7 @@ static inline void root_tag_clear_all(struct radix_tree_root *root)
static inline int root_tag_get(struct radix_tree_root *root, unsigned int tag) static inline int root_tag_get(struct radix_tree_root *root, unsigned int tag)
{ {
return root->gfp_mask & (1 << (tag + __GFP_BITS_SHIFT)); return (__force unsigned)root->gfp_mask & (1 << (tag + __GFP_BITS_SHIFT));
} }
/* /*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment