Messages in this thread Patch in this message | | | Date | Mon, 20 Jan 2014 19:20:13 +0100 | From | Oleg Nesterov <> | Subject | [PATCH 3/5] lockdep: change mark_held_locks() to check hlock->check instead of lockdep_no_validate |
| |
The __lockdep_no_validate check in mark_held_locks() adds the subtle and (afaics) unnecessary difference between no-validate and check==0. And this looks even more inconsistent because __lock_acquire() skips mark_irqflags()->mark_lock() if !check.
Change mark_held_locks() to check hlock->check instead.
Signed-off-by: Oleg Nesterov <oleg@redhat.com> --- kernel/locking/lockdep.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c index 543e120..28e41c0 100644 --- a/kernel/locking/lockdep.c +++ b/kernel/locking/lockdep.c @@ -2515,7 +2515,7 @@ mark_held_locks(struct task_struct *curr, enum mark_type mark) BUG_ON(usage_bit >= LOCK_USAGE_STATES); - if (hlock_class(hlock)->key == __lockdep_no_validate__.subkeys) + if (!hlock->check) continue; if (!mark_lock(curr, hlock, usage_bit)) -- 1.5.5.1
| |