Wed Jul 24 03:16:32 2013 UTC ()

Work around rb_tree_iterate API botch in linux_idr.c.


(riastradh)

diff -r1.1.2.6 -r1.1.2.7 src/sys/external/bsd/drm2/linux/linux_idr.c

--- src/sys/external/bsd/drm2/linux/linux_idr.c 2013/07/24 03:16:15	1.1.2.6
+++ src/sys/external/bsd/drm2/linux/linux_idr.c 2013/07/24 03:16:32	1.1.2.7

 @@ -1,14 +1,14 @@
-/*	$NetBSD: linux_idr.c,v 1.1.2.6 2013/07/24 03:16:15 riastradh Exp $	*/
+/*	$NetBSD: linux_idr.c,v 1.1.2.7 2013/07/24 03:16:32 riastradh Exp $	*/
 /*-
  * Copyright (c) 2013 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Taylor R. Campbell.
+ *
  * 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.
 @@ -20,27 +20,27 @@
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_idr.c,v 1.1.2.6 2013/07/24 03:16:15 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_idr.c,v 1.1.2.7 2013/07/24 03:16:32 riastradh Exp $");
 #include <sys/param.h>
 #include <sys/atomic.h>
 #include <sys/kmem.h>
 #include <sys/rbtree.h>
 #include <linux/err.h>
 #include <linux/idr.h>
 struct idr_node {
 	rb_node_t in_rb_node;
 	int in_index;
 	void *in_data;
 @@ -150,28 +150,27 @@ idr_remove(struct idr *idr, int id)
 	node = rb_tree_find_node(&idr->idr_tree, &id);
 	KASSERT(node != NULL);
 	rb_tree_remove_node(&idr->idr_tree, node);
 	rw_exit(&idr->idr_lock);
 	kmem_free(node, sizeof(*node));
+}
 void
 idr_remove_all(struct idr *idr)
+{
 	struct idr_node *node;
 	rw_enter(&idr->idr_lock, RW_WRITER);
-	while ((node = rb_tree_iterate(&idr->idr_tree, NULL, RB_DIR_RIGHT)) !=
+	while ((node = RB_TREE_MIN(&idr->idr_tree)) != NULL) {
 	    NULL) {
 		rb_tree_remove_node(&idr->idr_tree, node);
 		rw_exit(&idr->idr_lock);
 		kmem_free(node, sizeof(*node));
 		rw_enter(&idr->idr_lock, RW_WRITER);
+	}
 	rw_exit(&idr->idr_lock);
+}
 int
 idr_pre_get(struct idr *idr, int flags __unused /* XXX */)
+{
 	struct idr_node *temp = kmem_alloc(sizeof(*temp), KM_SLEEP);
 @@ -213,27 +212,26 @@ idr_get_new_above(struct idr *idr, void
 	node->in_data = data;
 	collision = rb_tree_insert_node(&idr->idr_tree, node);
 	KASSERT(collision == node);
 	rw_exit(&idr->idr_lock);
 	return 0;
+}
 int
 idr_for_each(struct idr *idr, int (*proc)(int, void *, void *), void *arg)
+{
-	struct idr_node *node = NULL;
+	struct idr_node *node;
 	int error = 0;
 	rw_enter(&idr->idr_lock, RW_READER);
-	while ((node = rb_tree_iterate(&idr->idr_tree, node, RB_DIR_RIGHT))
+	RB_TREE_FOREACH(node, &idr->idr_tree) {
 	    != NULL) {
 		error = (*proc)(node->in_index, node->in_data, arg);
 		if (error)
 			break;
+	}
 	rw_exit(&idr->idr_lock);
 	return error;
+}