AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

lockdep: Make __bfs(.match) return bool

Browse Source 
The "match" parameter of __bfs() is used for checking whether we hit a
match in the search, therefore it should return a boolean value rather
than an integer for better readability.

This patch then changes the return type of the function parameter and the
match functions to bool.

Suggested-by: Peter Zijlstra <peterz@infradead.org>
Signed-off-by: Boqun Feng <boqun.feng@gmail.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Link: https://lkml.kernel.org/r/20200807074238.1632519-9-boqun.feng@gmail.com
This commit is contained in:
Boqun Feng 2020-08-07 15:42:27 +08:00 committed by Peter Zijlstra
parent 6971c0f345
commit 61775ed243
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
kernel/locking/lockdep.c
View File

@ -1620,7 +1620,7 @@ static inline void bfs_init_rootb(struct lock_list *lock,
*/ */
static enum bfs_result __bfs(struct lock_list *source_entry, static enum bfs_result __bfs(struct lock_list *source_entry,
void *data, void *data,
int (*match)(struct lock_list *entry, void *data), bool (*match)(struct lock_list *entry, void *data),
struct lock_list **target_entry, struct lock_list **target_entry,
int offset) int offset)
{ {
@ -1711,7 +1711,7 @@ static enum bfs_result __bfs(struct lock_list *source_entry,
static inline enum bfs_result static inline enum bfs_result
__bfs_forwards(struct lock_list *src_entry, __bfs_forwards(struct lock_list *src_entry,
void *data, void *data,
int (*match)(struct lock_list *entry, void *data), bool (*match)(struct lock_list *entry, void *data),
struct lock_list **target_entry) struct lock_list **target_entry)
{ {
return __bfs(src_entry, data, match, target_entry, return __bfs(src_entry, data, match, target_entry,
@ -1722,7 +1722,7 @@ __bfs_forwards(struct lock_list *src_entry,
static inline enum bfs_result static inline enum bfs_result
__bfs_backwards(struct lock_list *src_entry, __bfs_backwards(struct lock_list *src_entry,
void *data, void *data,
int (*match)(struct lock_list *entry, void *data), bool (*match)(struct lock_list *entry, void *data),
struct lock_list **target_entry) struct lock_list **target_entry)
{ {
return __bfs(src_entry, data, match, target_entry, return __bfs(src_entry, data, match, target_entry,
@ -1833,7 +1833,7 @@ print_circular_bug_header(struct lock_list *entry, unsigned int depth,
print_circular_bug_entry(entry, depth); print_circular_bug_entry(entry, depth);
} }
static inline int class_equal(struct lock_list *entry, void *data) static inline bool class_equal(struct lock_list *entry, void *data)
{ {
return entry->class == data; return entry->class == data;
} }
@ -1888,10 +1888,10 @@ static noinline void print_bfs_bug(int ret)
WARN(1, "lockdep bfs error:%d\n", ret); WARN(1, "lockdep bfs error:%d\n", ret);
} }
static int noop_count(struct lock_list *entry, void *data) static bool noop_count(struct lock_list *entry, void *data)
{ {
(*(unsigned long *)data)++; (*(unsigned long *)data)++;
return 0; return false;
} }
static unsigned long __lockdep_count_forward_deps(struct lock_list *this) static unsigned long __lockdep_count_forward_deps(struct lock_list *this)
@ -2032,11 +2032,11 @@ check_redundant(struct held_lock *src, struct held_lock *target)
#ifdef CONFIG_TRACE_IRQFLAGS #ifdef CONFIG_TRACE_IRQFLAGS
static inline int usage_accumulate(struct lock_list *entry, void *mask) static inline bool usage_accumulate(struct lock_list *entry, void *mask)
{ {
*(unsigned long *)mask |= entry->class->usage_mask; *(unsigned long *)mask |= entry->class->usage_mask;
return 0; return false;
} }
/* /*
@ -2045,9 +2045,9 @@ static inline int usage_accumulate(struct lock_list *entry, void *mask)
* without creating any illegal irq-safe -> irq-unsafe lock dependency. * without creating any illegal irq-safe -> irq-unsafe lock dependency.
*/ */
static inline int usage_match(struct lock_list *entry, void *mask) static inline bool usage_match(struct lock_list *entry, void *mask)
{ {
return entry->class->usage_mask & *(unsigned long *)mask; return !!(entry->class->usage_mask & *(unsigned long *)mask);
} }
/* /*