1 files changed, 5 insertions, 5 deletions

diff --git a/lib/radix-tree.c b/lib/radix-tree.c
index f9ebe1c82060..fcf5d98574ce 100644
--- 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.
          */
-        if (!(gfp_mask & __GFP_WAIT) && !in_interrupt()) {
+        if (!gfpflags_allow_blocking(gfp_mask) && !in_interrupt()) {
                 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
- * __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)
 {
@@ -286,12 +286,12 @@ out:
  * 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... */
-        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);
@@ -303,7 +303,7 @@ EXPORT_SYMBOL(radix_tree_preload);
  */
 int radix_tree_maybe_preload(gfp_t gfp_mask)
 {
-        if (gfp_mask & __GFP_WAIT)
+        if (gfpflags_allow_blocking(gfp_mask))
                 return __radix_tree_preload(gfp_mask);
         /* Preloading doesn't help anything with this gfp mask, skip it */
         preempt_disable();