Module Name: src
Committed By: riastradh
Date: Wed Jul 24 02:07:09 UTC 2013
Modified Files:
src/sys/external/bsd/drm2/include/linux [riastradh-drm2]: idr.h
src/sys/external/bsd/drm2/linux [riastradh-drm2]: linux_idr.c
Log Message:
Implement idr_remove_all.
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.2 -r1.1.2.3 \
src/sys/external/bsd/drm2/include/linux/idr.h
cvs rdiff -u -r1.1.2.2 -r1.1.2.3 src/sys/external/bsd/drm2/linux/linux_idr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm2/include/linux/idr.h
diff -u src/sys/external/bsd/drm2/include/linux/idr.h:1.1.2.2 src/sys/external/bsd/drm2/include/linux/idr.h:1.1.2.3
--- src/sys/external/bsd/drm2/include/linux/idr.h:1.1.2.2 Wed Jul 24 00:50:36 2013
+++ src/sys/external/bsd/drm2/include/linux/idr.h Wed Jul 24 02:07:09 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: idr.h,v 1.1.2.2 2013/07/24 00:50:36 riastradh Exp $ */
+/* $NetBSD: idr.h,v 1.1.2.3 2013/07/24 02:07:09 riastradh Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -48,6 +48,7 @@ void idr_init(struct idr *);
void idr_destroy(struct idr *);
void *idr_find(struct idr *, int);
void idr_remove(struct idr *, int);
+void idr_remove_all(struct idr *);
int idr_pre_get(struct idr *, int);
int idr_get_new_above(struct idr *, void *, int, int *);
Index: src/sys/external/bsd/drm2/linux/linux_idr.c
diff -u src/sys/external/bsd/drm2/linux/linux_idr.c:1.1.2.2 src/sys/external/bsd/drm2/linux/linux_idr.c:1.1.2.3
--- src/sys/external/bsd/drm2/linux/linux_idr.c:1.1.2.2 Wed Jul 24 01:56:48 2013
+++ src/sys/external/bsd/drm2/linux/linux_idr.c Wed Jul 24 02:07:09 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_idr.c,v 1.1.2.2 2013/07/24 01:56:48 riastradh Exp $ */
+/* $NetBSD: linux_idr.c,v 1.1.2.3 2013/07/24 02:07:09 riastradh Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_idr.c,v 1.1.2.2 2013/07/24 01:56:48 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_idr.c,v 1.1.2.3 2013/07/24 02:07:09 riastradh Exp $");
#include <sys/param.h>
#include <sys/atomic.h>
@@ -134,6 +134,22 @@ idr_remove(struct idr *idr, int id)
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)) !=
+ 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 */)
{
