Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 96be753a authored by Paul E. McKenney's avatar Paul E. McKenney Committed by Ingo Molnar
Browse files

idr: Apply lockdep-based diagnostics to rcu_dereference() uses 



Because idr can be used with any of a number of locks or with
any flavor of RCU, just disable the lockdep-based diagnostics.
If idr needs diagnostics, the check expression will need to be
passed into the relevant idr primitives as an additional
argument.

Signed-off-by: default avatarPaul E. McKenney <paulmck@linux.vnet.ibm.com>
Cc: laijs@cn.fujitsu.com
Cc: dipankar@in.ibm.com
Cc: mathieu.desnoyers@polymtl.ca
Cc: josh@joshtriplett.org
Cc: dvhltc@us.ibm.com
Cc: niv@us.ibm.com
Cc: peterz@infradead.org
Cc: rostedt@goodmis.org
Cc: Valdis.Kletnieks@vt.edu
Cc: dhowells@redhat.com
LKML-Reference: <1266887105-1528-11-git-send-email-paulmck@linux.vnet.ibm.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 2676a58c

lib/idr.c

+4 −4
Original line number Diff line number Diff line
@@ -504,7 +504,7 @@ void *idr_find(struct idr *idp, int id) 
	int n;

	struct idr_layer *p;



	p = rcu_dereference(idp->top);

	p = rcu_dereference_raw(idp->top);

	if (!p)

		return NULL;

	n = (p->layer+1) * IDR_BITS;
@@ -519,7 +519,7 @@ void *idr_find(struct idr *idp, int id) 
	while (n > 0 && p) {

		n -= IDR_BITS;

		BUG_ON(n != p->layer*IDR_BITS);

		p = rcu_dereference(p->ary[(id >> n) & IDR_MASK]);

		p = rcu_dereference_raw(p->ary[(id >> n) & IDR_MASK]);

	}

	return((void *)p);

}
@@ -552,7 +552,7 @@ int idr_for_each(struct idr *idp, 
	struct idr_layer **paa = &pa[0];



	n = idp->layers * IDR_BITS;

	p = rcu_dereference(idp->top);

	p = rcu_dereference_raw(idp->top);

	max = 1 << n;



	id = 0;
@@ -560,7 +560,7 @@ int idr_for_each(struct idr *idp, 
		while (n > 0 && p) {

			n -= IDR_BITS;

			*paa++ = p;

			p = rcu_dereference(p->ary[(id >> n) & IDR_MASK]);

			p = rcu_dereference_raw(p->ary[(id >> n) & IDR_MASK]);

		}



		if (p) {