 @@ -1,14 +1,14 @@
-/*	$NetBSD: radixtree.c,v 1.22 2020/01/28 16:33:34 ad Exp $	*/
+/*	$NetBSD: radixtree.c,v 1.23 2020/01/28 22:20:45 ad Exp $	*/
 /*-
  * Copyright (c)2011,2012,2013 YAMAMOTO Takashi,
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -102,37 +102,37 @@
  * leaf nodes with the given tag.  To reduce amount of nodes to visit for
  * these functions, this implementation keeps tagging information in internal
  * intermediate nodes and quickly skips uninterested parts of a tree.
+ *
  * A tree has RADIX_TREE_TAG_ID_MAX independent tag spaces, each of which are
  * identified by an zero-origin numbers, tagid.  For the current implementation,
  * RADIX_TREE_TAG_ID_MAX is 2.  A set of tags is described as a bitmask tagmask,
  * which is a bitwise OR of (1 << tagid).
  */
 #include <sys/cdefs.h>
 #if defined(_KERNEL) || defined(_STANDALONE)
-__KERNEL_RCSID(0, "$NetBSD: radixtree.c,v 1.22 2020/01/28 16:33:34 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: radixtree.c,v 1.23 2020/01/28 22:20:45 ad Exp $");
 #include <sys/param.h>
 #include <sys/errno.h>
 #include <sys/pool.h>
 #include <sys/radixtree.h>
 #include <lib/libkern/libkern.h>
 #if defined(_STANDALONE)
 #include <lib/libsa/stand.h>
 #endif /* defined(_STANDALONE) */
 #else /* defined(_KERNEL) || defined(_STANDALONE) */
-__RCSID("$NetBSD: radixtree.c,v 1.22 2020/01/28 16:33:34 ad Exp $");
+__RCSID("$NetBSD: radixtree.c,v 1.23 2020/01/28 22:20:45 ad Exp $");
 #include <assert.h>
 #include <errno.h>
 #include <stdbool.h>
 #include <stdlib.h>
 #include <string.h>
 #if 1
 #define KASSERT assert
 #else
 #define KASSERT(a)	/* nothing */
 #endif
 #endif /* defined(_KERNEL) || defined(_STANDALONE) */
 #include <sys/radixtree.h>
 @@ -833,54 +833,36 @@ gang_lookup_scan(struct radix_tree *t, s
 scan_siblings:
 		/*
 		 * try to find the next matching non-NULL sibling.
 		 */
 		if (lastidx == 0) {
 			/*
 			 * the root has no siblings.
 			 * we've done.
 			 */
 			KASSERT(vpp == &t->t_root);
 			break;
+		}
 		n = path_node(t, path, lastidx - 1);
 		/*
 		 * we used to have an integer counter in the node, and this
 		 * optimization made sense then, even though marginal.  it
 		 * no longer provides benefit with the structure cache line
 		 * aligned and the counter replaced by an unrolled sequence
 		 * testing the pointers in batch.
 		 */
 #if 0
 		if (*vpp != NULL && radix_tree_node_count_ptrs(n) == 1) {
 			/*
 			 * optimization; if the node has only a single pointer
 			 * and we've already visited it, there's no point to
 			 * keep scanning in this node.
 			 */
 			goto no_siblings;
 #endif /* 0 */
 		for (i = vpp - n->n_ptrs + step; i != guard; i += step) {
 			KASSERT(i < RADIX_TREE_PTR_PER_NODE);
 			if (entry_match_p(n->n_ptrs[i], tagmask)) {
 				vpp = &n->n_ptrs[i];
 				break;
 			} else if (dense) {
 				return nfound;
+			}
+		}
 		if (i == guard) {
 #if 0
 no_siblings:
 #endif /* 0 */
 			/*
 			 * not found.  go to parent.
 			 */
 			lastidx--;
 			vpp = path_pptr(t, path, lastidx);
 			goto scan_siblings;
+		}
 descend:
 		/*
 		 * following the left-most (or right-most in the case of
 		 * reverse scan) child node, decend until reaching the leaf or
 		 * an non-matching entry.
 		 */