projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
MAINTAINERS: nilfs2: add header file for tracing
[firefly-linux-kernel-4.4.55.git]
/
lib
/
radix-tree.c
diff --git
a/lib/radix-tree.c
b/lib/radix-tree.c
index f9ebe1c82060ec330ac7ae7a9d1678f18058cf65..fcf5d98574ce46871dca087d2c803dbfb67c0b81 100644
(file)
--- a/
lib/radix-tree.c
+++ b/
lib/radix-tree.c
@@
-188,7
+188,7
@@
radix_tree_node_alloc(struct radix_tree_root *root)
* preloading in the interrupt anyway as all the allocations have to
* be atomic. So just do normal allocation when in interrupt.
*/
* preloading in the interrupt anyway as all the allocations have to
* be atomic. So just do normal allocation when in interrupt.
*/
- if (!
(gfp_mask & __GFP_WAIT
) && !in_interrupt()) {
+ if (!
gfpflags_allow_blocking(gfp_mask
) && !in_interrupt()) {
struct radix_tree_preload *rtp;
/*
struct radix_tree_preload *rtp;
/*
@@
-249,7
+249,7
@@
radix_tree_node_free(struct radix_tree_node *node)
* with preemption not disabled.
*
* To make use of this facility, the radix tree must be initialised without
* with preemption not disabled.
*
* To make use of this facility, the radix tree must be initialised without
- * __GFP_
WAIT
being passed to INIT_RADIX_TREE().
+ * __GFP_
DIRECT_RECLAIM
being passed to INIT_RADIX_TREE().
*/
static int __radix_tree_preload(gfp_t gfp_mask)
{
*/
static int __radix_tree_preload(gfp_t gfp_mask)
{
@@
-286,12
+286,12
@@
out:
* with preemption not disabled.
*
* To make use of this facility, the radix tree must be initialised without
* with preemption not disabled.
*
* To make use of this facility, the radix tree must be initialised without
- * __GFP_
WAIT
being passed to INIT_RADIX_TREE().
+ * __GFP_
DIRECT_RECLAIM
being passed to INIT_RADIX_TREE().
*/
int radix_tree_preload(gfp_t gfp_mask)
{
/* Warn on non-sensical use... */
*/
int radix_tree_preload(gfp_t gfp_mask)
{
/* Warn on non-sensical use... */
- WARN_ON_ONCE(!
(gfp_mask & __GFP_WAIT
));
+ WARN_ON_ONCE(!
gfpflags_allow_blocking(gfp_mask
));
return __radix_tree_preload(gfp_mask);
}
EXPORT_SYMBOL(radix_tree_preload);
return __radix_tree_preload(gfp_mask);
}
EXPORT_SYMBOL(radix_tree_preload);
@@
-303,7
+303,7
@@
EXPORT_SYMBOL(radix_tree_preload);
*/
int radix_tree_maybe_preload(gfp_t gfp_mask)
{
*/
int radix_tree_maybe_preload(gfp_t gfp_mask)
{
- if (gfp
_mask & __GFP_WAIT
)
+ if (gfp
flags_allow_blocking(gfp_mask)
)
return __radix_tree_preload(gfp_mask);
/* Preloading doesn't help anything with this gfp mask, skip it */
preempt_disable();
return __radix_tree_preload(gfp_mask);
/* Preloading doesn't help anything with this gfp mask, skip it */
preempt_disable();