Messages in this thread Patch in this message | | | From | tom.leiming@gmail ... | Subject | [RESEND PATCH 11/11] kernel:lockdep:fix return value of check_usage*() | Date | Sun, 28 Jun 2009 23:04:46 +0800 |
| |
From: Ming Lei <tom.leiming@gmail.com>
Return zero if BFS find the target, so fix return value of callers of BFS.
The patch fixes the boot failure introduced by the patch: lockdep: clean up after BFS patches .
Signed-off-by: Ming Lei <tom.leiming@gmail.com> --- kernel/lockdep.c | 20 ++++++++++++-------- 1 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/kernel/lockdep.c b/kernel/lockdep.c index 09a141f..48c3364 100644 --- a/kernel/lockdep.c +++ b/kernel/lockdep.c @@ -1250,8 +1250,6 @@ find_usage_forwards(struct lock_list *root, enum lock_usage_bit bit, debug_atomic_inc(&nr_find_usage_forwards_checks); result = __bfs_forwards(root, (void *)bit, usage_match, target_entry); - if (result < 0) - return print_bfs_bug(result); return result; } @@ -1275,8 +1273,6 @@ find_usage_backwards(struct lock_list *root, enum lock_usage_bit bit, debug_atomic_inc(&nr_find_usage_backwards_checks); result = __bfs_backwards(root, (void *)bit, usage_match, target_entry); - if (result < 0) - return print_bfs_bug(result); return result; } @@ -1397,13 +1393,17 @@ check_usage(struct task_struct *curr, struct held_lock *prev, this.class = hlock_class(prev); ret = find_usage_backwards(&this, bit_backwards, &target_entry); - if (!ret || ret == 1) + if (ret < 0) + return print_bfs_bug(ret); + if (ret == 1) return ret; that.parent = NULL; that.class = hlock_class(next); ret = find_usage_forwards(&that, bit_forwards, &target_entry1); - if (!ret || ret == 1) + if (ret < 0) + return print_bfs_bug(ret); + if (ret == 1) return ret; return print_bad_irq_dependency(curr, &this, &that, @@ -2088,7 +2088,9 @@ check_usage_forwards(struct task_struct *curr, struct held_lock *this, root.parent = NULL; root.class = hlock_class(this); ret = find_usage_forwards(&root, bit, &target_entry); - if (!ret || ret == 1) + if (ret < 0) + return print_bfs_bug(ret); + if (ret == 1) return ret; return print_irq_inversion_bug(curr, &root, target_entry, @@ -2110,7 +2112,9 @@ check_usage_backwards(struct task_struct *curr, struct held_lock *this, root.parent = NULL; root.class = hlock_class(this); ret = find_usage_backwards(&root, bit, &target_entry); - if (!ret || ret == 1) + if (ret < 0) + return print_bfs_bug(ret); + if (ret == 1) return ret; return print_irq_inversion_bug(curr, &root, target_entry, -- 1.6.0.GIT
| |