Commit 4a195a0b authored by Waiman Long's avatar Waiman Long Committed by Greg Kroah-Hartman

locking/lockdep: Add debug_locks check in __lock_downgrade()

commit 71492580571467fb7177aade19c18ce7486267f5 upstream.

Tetsuo Handa had reported he saw an incorrect "downgrading a read lock"
warning right after a previous lockdep warning. It is likely that the
previous warning turned off lock debugging causing the lockdep to have
inconsistency states leading to the lock downgrade warning.

Fix that by add a check for debug_locks at the beginning of
Debugged-by: default avatarTetsuo Handa <>
Reported-by: default avatarTetsuo Handa <>
Signed-off-by: default avatarWaiman Long <>
Signed-off-by: default avatarPeter Zijlstra (Intel) <>
Cc: Andrew Morton <>
Cc: Linus Torvalds <>
Cc: Paul E. McKenney <>
Cc: Peter Zijlstra <>
Cc: Thomas Gleixner <>
Cc: Will Deacon <>
Link: default avatarIngo Molnar <>
Signed-off-by: default avatarGreg Kroah-Hartman <>
parent 5befc25f
......@@ -3650,6 +3650,9 @@ __lock_set_class(struct lockdep_map *lock, const char *name,
unsigned int depth;
int i;
if (unlikely(!debug_locks))
return 0;
depth = curr->lockdep_depth;
* This function is about (re)setting the class of a held lock,
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment