Module Name: src
Committed By: riastradh
Date: Wed Jul 24 02:07:46 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_replace.
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.3 -r1.1.2.4 \
src/sys/external/bsd/drm2/include/linux/idr.h
cvs rdiff -u -r1.1.2.3 -r1.1.2.4 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.3 src/sys/external/bsd/drm2/include/linux/idr.h:1.1.2.4
--- src/sys/external/bsd/drm2/include/linux/idr.h:1.1.2.3 Wed Jul 24 02:07:09 2013
+++ src/sys/external/bsd/drm2/include/linux/idr.h Wed Jul 24 02:07:46 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: idr.h,v 1.1.2.3 2013/07/24 02:07:09 riastradh Exp $ */
+/* $NetBSD: idr.h,v 1.1.2.4 2013/07/24 02:07:46 riastradh Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -47,6 +47,7 @@ struct idr {
void idr_init(struct idr *);
void idr_destroy(struct idr *);
void *idr_find(struct idr *, int);
+void *idr_replace(struct idr *, void *, int);
void idr_remove(struct idr *, int);
void idr_remove_all(struct idr *);
int idr_pre_get(struct idr *, 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.3 src/sys/external/bsd/drm2/linux/linux_idr.c:1.1.2.4
--- src/sys/external/bsd/drm2/linux/linux_idr.c:1.1.2.3 Wed Jul 24 02:07:09 2013
+++ src/sys/external/bsd/drm2/linux/linux_idr.c Wed Jul 24 02:07:46 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_idr.c,v 1.1.2.3 2013/07/24 02:07:09 riastradh Exp $ */
+/* $NetBSD: linux_idr.c,v 1.1.2.4 2013/07/24 02:07:46 riastradh Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -30,13 +30,14 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_idr.c,v 1.1.2.3 2013/07/24 02:07:09 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_idr.c,v 1.1.2.4 2013/07/24 02:07:46 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 {
@@ -121,6 +122,25 @@ idr_find(struct idr *idr, int id)
return data;
}
+void *
+idr_replace(struct idr *idr, void *replacement, int id)
+{
+ struct idr_node *node;
+ void *result;
+
+ rw_enter(&idr->idr_lock, RW_WRITER);
+ node = rb_tree_find_node(&idr->idr_tree, &id);
+ if (node == NULL) {
+ result = ERR_PTR(-ENOENT);
+ } else {
+ result = node->in_data;
+ node->in_data = replacement;
+ }
+ rw_exit(&idr->idr_lock);
+
+ return result;
+}
+
void
idr_remove(struct idr *idr, int id)
{
