[PATCH 06/13] lib/generic-radix-tree: Rename gfp_mask to gfp to shorten lines.

[David Laight <David.Laight@xxxxxxxxxx>]

Rename gfp_mask to gfp to shorten lines.

Signed-off-by: David Laight <david.laight@xxxxxxxxxx>
---
 lib/generic-radix-tree.c | 28 +++++++++++++---------------
 1 file changed, 13 insertions(+), 15 deletions(-)

diff --git a/lib/generic-radix-tree.c b/lib/generic-radix-tree.c
index b378e10c8fa4..219b43250a06 100644
--- a/lib/generic-radix-tree.c
+++ b/lib/generic-radix-tree.c
@@ -87,18 +87,18 @@ void *__genradix_ptr(struct __genradix *radix, size_t offset)
 }
 EXPORT_SYMBOL(__genradix_ptr);
 
-static inline struct genradix_node *genradix_alloc_node(gfp_t gfp_mask)
+static inline struct genradix_node *genradix_alloc_node(gfp_t gfp)
 {
 	struct genradix_node *node;
 
-	node = (struct genradix_node *)__get_free_page(gfp_mask|__GFP_ZERO);
+	node = (struct genradix_node *)__get_free_page(gfp | __GFP_ZERO);
 
 	/*
 	 * We're using pages (not slab allocations) directly for kernel data
 	 * structures, so we need to explicitly inform kmemleak of them in order
 	 * to avoid false positive memory leak reports.
 	 */
-	kmemleak_alloc(node, PAGE_SIZE, 1, gfp_mask);
+	kmemleak_alloc(node, PAGE_SIZE, 1, gfp);
 	return node;
 }
 
@@ -110,9 +110,9 @@ static inline void genradix_free_node(struct genradix_node *node)
 
 static noinline struct genradix_node *
 alloc_node(struct genradix_node **tgt, struct genradix_node *old,
-	    struct genradix_node *child, unsigned int level, gfp_t gfp_mask)
+	    struct genradix_node *child, unsigned int level, gfp_t gfp)
 {
-	struct genradix_node *n = genradix_alloc_node(gfp_mask);
+	struct genradix_node *n = genradix_alloc_node(gfp);
 	struct genradix_node *new_node, *check;
 
 	if (!n)
@@ -132,17 +132,16 @@ alloc_node(struct genradix_node **tgt, struct genradix_node *old,
 
 static struct genradix_root *
 alloc_root(struct genradix_root **tgt, struct genradix_root *old,
-	    struct genradix_node *child, unsigned int level, gfp_t gfp_mask)
+	    struct genradix_node *child, unsigned int level, gfp_t gfp)
 {
-	return (void *)alloc_node((void *)tgt, (void *)old, child, level, gfp_mask);
+	return (void *)alloc_node((void *)tgt, (void *)old, child, level, gfp);
 }
 
 /*
  * Returns pointer to the specified byte @offset within @radix, allocating it if
  * necessary - newly allocated slots are always zeroed out:
  */
-void *__genradix_ptr_alloc(struct __genradix *radix, size_t offset,
-			   gfp_t gfp_mask)
+void *__genradix_ptr_alloc(struct __genradix *radix, size_t offset, gfp_t gfp)
 {
 	struct genradix_node *n, *n1;
 	struct genradix_root *r;
@@ -157,7 +156,7 @@ void *__genradix_ptr_alloc(struct __genradix *radix, size_t offset,
 		n = genradix_root_to_node(r);
 		if (likely(n))
 			return n->data + offset;
-		r = alloc_root(&radix->root, NULL, NULL, 0, gfp_mask);
+		r = alloc_root(&radix->root, NULL, NULL, 0, gfp);
 		if (!r)
 			return NULL;
 		level = genradix_root_to_depth(r);
@@ -177,7 +176,7 @@ void *__genradix_ptr_alloc(struct __genradix *radix, size_t offset,
 			break;
 
 		/* Tree depth needs increasing */
-		r = alloc_root(&radix->root, r, n, level + 1, gfp_mask);
+		r = alloc_root(&radix->root, r, n, level + 1, gfp);
 		if (!r)
 			return NULL;
 
@@ -189,7 +188,7 @@ void *__genradix_ptr_alloc(struct __genradix *radix, size_t offset,
 	for (;;) {
 		n1 = READ_ONCE(n->children[idx]);
 		if (unlikely(!n1)) {
-			n1 = alloc_node(n->children + idx, NULL, NULL, 0, gfp_mask);
+			n1 = alloc_node(n->children + idx, NULL, NULL, 0, gfp);
 			if (!n1)
 				return NULL;
 		}
@@ -259,13 +258,12 @@ static void genradix_free_recurse(struct genradix_node *n, unsigned level)
 	genradix_free_node(n);
 }
 
-int __genradix_prealloc(struct __genradix *radix, size_t size,
-			gfp_t gfp_mask)
+int __genradix_prealloc(struct __genradix *radix, size_t size, gfp_t gfp)
 {
 	size_t offset;
 
 	for (offset = 0; offset < size; offset += PAGE_SIZE)
-		if (!__genradix_ptr_alloc(radix, offset, gfp_mask))
+		if (!__genradix_ptr_alloc(radix, offset, gfp))
 			return -ENOMEM;
 
 	return 0;
-- 
2.25.1

-
Registered Address Lakeside, Bramley Road, Mount Farm, Milton Keynes, MK1 1PT, UK
Registration No: 1397386 (Wales)