[PATCH] lockdep: allow read_lock() recursion of same class

[linux-2.6-block.git] / kernel / lockdep.c

diff --git a/kernel/lockdep.c b/kernel/lockdep.c
index dd0580910a97593a44ec9fffcede215732866ff0..f32ca78c198d20c3ee6a1362f0c7b414e64db077 100644 (file)
--- a/kernel/lockdep.c
+++ b/kernel/lockdep.c
@@ -843,10 +843,9 @@ check_deadlock(struct task_struct *curr, struct held_lock *next,
                        continue;
                /*
                 * Allow read-after-read recursion of the same
-                * lock instance (i.e. read_lock(lock)+read_lock(lock)):
+                * lock class (i.e. read_lock(lock)+read_lock(lock)):
                 */
-               if ((read == 2) && prev->read &&
-                               (prev->instance == next_instance))
+               if ((read == 2) && prev->read)
                        return 2;
                return print_deadlock_bug(curr, prev, next);
        }