[PATCH 10/13] Fix ridr_find()

[Nadia.Derbey@bull.net]

[-- Attachment #1: ridr_find.patch --]
[-- Type: text/plain, Size: 955 bytes --]

[PATCH 10/13]

This patch only fixes the ridr_find() portion of ridr.c,
to make it RCU based.

Signed-off-by: Nadia Derbey <Nadia.Derbey@bull.net>

---
 lib/ridr.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Index: linux-2.6.25-rc8-mm1/lib/ridr.c
===================================================================
--- linux-2.6.25-rc8-mm1.orig/lib/ridr.c	2008-04-11 18:04:08.000000000 +0200
+++ linux-2.6.25-rc8-mm1/lib/ridr.c	2008-04-11 18:09:00.000000000 +0200
@@ -381,7 +381,7 @@ void *ridr_find(struct ridr *idp, int id
 	struct ridr_layer *p;
 
 	n = idp->layers * IDR_BITS;
-	p = idp->top;
+	p = rcu_dereference(idp->top);
 
 	/* Mask off upper bits we don't use for the search. */
 	id &= MAX_ID_MASK;
@@ -391,7 +391,7 @@ void *ridr_find(struct ridr *idp, int id
 
 	while (n > 0 && p) {
 		n -= IDR_BITS;
-		p = p->ary[(id >> n) & IDR_MASK];
+		p = rcu_dereference(p->ary[(id >> n) & IDR_MASK]);
 	}
 	return((void *)p);
 }

--