Skip to contentSkip to conversation

lib/generic-radix-tree: Make good use of while (level--)

PATCH In review Andy Shevchenko 2 participants 2 messages Mar 21, 2019

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 lib/generic-radix-tree: Make good use of while (level--)

There is no need to split postincrement in while (level--) type of loops.

---
 lib/generic-radix-tree.c | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)
lib/generic-radix-tree.c +2 -8
index a7bafc413730..5a1818a0de1f 100644
@@ -59,13 +59,9 @@ void *__genradix_ptr(struct __genradix *radix, size_t offset)
 	if (ilog2(offset) >= genradix_depth_shift(level))
 		return NULL;
 
-	while (1) {
+	while (level--) {
 		if (!n)
 			return NULL;
-		if (!level)
-			break;
-
-		level--;
 
 		n = n->children[offset >> genradix_depth_shift(level)];
 		offset &= genradix_depth_size(level) - 1;
@@ -157,9 +153,7 @@ void *__genradix_iter_peek(struct genradix_iter *iter,
 	if (ilog2(iter->offset) >= genradix_depth_shift(level))
 		return NULL;
 
-	while (level) {
-		level--;
-
+	while (level--) {
 		i = (iter->offset >> genradix_depth_shift(level)) &
 			(GENRADIX_ARY - 1);
 
Signature · 1 line
2.20.1
#1 lore raw
Quoted 14 lines · Andy Shevchenko

There is no need to split postincrement in while (level--) type of loops.

---
 lib/generic-radix-tree.c | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)
lib/generic-radix-tree.c +0 -0
index a7bafc413730..5a1818a0de1f 100644
@@ -59,13 +59,9 @@ void *__genradix_ptr(struct __genradix *radix, size_t offset)
        if (ilog2(offset) >= genradix_depth_shift(level))

lib/generic-radix-tree.c void *__genradix_ptr(struct __genradix *radix, size_t offset) · line 68

Quoted 10 lines
lib/generic-radix-tree.c +1 -5
                return NULL;
 
-       while (1) {
+       while (level--) {
                if (!n)
                        return NULL;
-               if (!level)
-                       break;
-
-               level--;

My bad, this will need an additional check. before the loop.

Quoted 17 lines
lib/generic-radix-tree.c +1 -4
                n = n->children[offset >> genradix_depth_shift(level)];
                offset &= genradix_depth_size(level) - 1;
@@ -157,9 +153,7 @@ void *__genradix_iter_peek(struct genradix_iter *iter,
        if (ilog2(iter->offset) >= genradix_depth_shift(level))
                return NULL;
 
-       while (level) {
-               level--;
-
+       while (level--) {
                i = (iter->offset >> genradix_depth_shift(level)) &
                        (GENRADIX_ARY - 1);
 
--

2.20.1

Signature · 2 lines
With Best Regards,
Andy Shevchenko