Messages in this thread Patch in this message | | | From | Yuyang Du <> | Subject | [PATCH v2 05/19] locking/lockdep: Adjust indents for function definitions | Date | Mon, 18 Mar 2019 16:57:19 +0800 |
| |
Being paranoid to see function arguments lines are aligned.
Signed-off-by: Yuyang Du <duyuyang@gmail.com> --- kernel/locking/lockdep.c | 63 +++++++++++++++++++++++------------------------- 1 file changed, 30 insertions(+), 33 deletions(-)
diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c index dea495b..320ab62 100644 --- a/kernel/locking/lockdep.c +++ b/kernel/locking/lockdep.c @@ -1308,7 +1308,7 @@ static inline unsigned int __cq_get_elem_count(struct circular_queue *cq) } static inline void mark_lock_accessed(struct lock_list *lock, - struct lock_list *parent) + struct lock_list *parent) { unsigned long nr; @@ -1413,19 +1413,17 @@ static int __bfs(struct lock_list *source_entry, return ret; } -static inline int __bfs_forwards(struct lock_list *src_entry, - void *data, - int (*match)(struct lock_list *entry, void *data), - struct lock_list **target_entry) +static inline int __bfs_forwards(struct lock_list *src_entry, void *data, + int (*match)(struct lock_list *entry, void *data), + struct lock_list **target_entry) { return __bfs(src_entry, data, match, target_entry, 1); } -static inline int __bfs_backwards(struct lock_list *src_entry, - void *data, - int (*match)(struct lock_list *entry, void *data), - struct lock_list **target_entry) +static inline int __bfs_backwards(struct lock_list *src_entry, void *data, + int (*match)(struct lock_list *entry, void *data), + struct lock_list **target_entry) { return __bfs(src_entry, data, match, target_entry, 0); @@ -1507,8 +1505,8 @@ static void print_circular_lock_scenario(struct held_lock *src, */ static noinline void print_circular_bug_header(struct lock_list *entry, unsigned int depth, - struct held_lock *check_src, - struct held_lock *check_tgt) + struct held_lock *check_src, + struct held_lock *check_tgt) { struct task_struct *curr = current; @@ -1653,7 +1651,7 @@ unsigned long lockdep_count_backward_deps(struct lock_class *class) */ static noinline int check_noncircular(struct lock_list *root, struct lock_class *target, - struct lock_list **target_entry) + struct lock_list **target_entry) { int result; @@ -1703,7 +1701,7 @@ static inline int usage_match(struct lock_list *entry, void *bit) */ static int find_usage_forwards(struct lock_list *root, enum lock_usage_bit bit, - struct lock_list **target_entry) + struct lock_list **target_entry) { int result; @@ -1726,7 +1724,7 @@ static inline int usage_match(struct lock_list *entry, void *bit) */ static int find_usage_backwards(struct lock_list *root, enum lock_usage_bit bit, - struct lock_list **target_entry) + struct lock_list **target_entry) { int result; @@ -2018,7 +2016,7 @@ static int check_irq_usage(struct task_struct *curr, struct held_lock *prev, static int check_prev_add_irq(struct task_struct *curr, struct held_lock *prev, - struct held_lock *next) + struct held_lock *next) { #define LOCKDEP_STATE(__STATE) \ if (!check_irq_usage(curr, prev, next, LOCK_USED_IN_##__STATE)) \ @@ -2392,7 +2390,7 @@ struct lock_class *lock_chain_get_class(struct lock_chain *chain, int i) * Returns the index of the first held_lock of the current chain */ static inline int get_first_held_lock(struct task_struct *curr, - struct held_lock *hlock) + struct held_lock *hlock) { int i; struct held_lock *hlock_curr; @@ -2487,8 +2485,8 @@ static void print_collision(struct task_struct *curr, * Returns: 0 not passed, 1 passed */ static int check_no_collision(struct task_struct *curr, - struct held_lock *hlock, - struct lock_chain *chain) + struct held_lock *hlock, + struct lock_chain *chain) { #ifdef CONFIG_DEBUG_LOCKDEP int i, j, id; @@ -2675,7 +2673,7 @@ static inline int lookup_chain_cache_add(struct task_struct *curr, } static int validate_chain(struct task_struct *curr, struct lockdep_map *lock, - struct held_lock *hlock, int chain_head, u64 chain_key) + struct held_lock *hlock, int chain_head, u64 chain_key) { /* * Trylock needs to maintain the stack of held locks, but it @@ -3032,7 +3030,7 @@ typedef int (*check_usage_f)(struct task_struct *, struct held_lock *, static int mark_lock_irq(struct task_struct *curr, struct held_lock *this, - enum lock_usage_bit new_bit) + enum lock_usage_bit new_bit) { int excl_bit = exclusive_bit(new_bit); int read = new_bit & LOCK_USAGE_READ_MASK; @@ -3060,7 +3058,7 @@ typedef int (*check_usage_f)(struct task_struct *, struct held_lock *, * states. */ if ((!read || !dir || STRICT_READ_CHECKS) && - !usage(curr, this, excl_bit, state_name(new_bit & ~LOCK_USAGE_READ_MASK))) + !usage(curr, this, excl_bit, state_name(new_bit & ~LOCK_USAGE_READ_MASK))) return 0; /* @@ -3071,8 +3069,8 @@ typedef int (*check_usage_f)(struct task_struct *, struct held_lock *, return 0; if (STRICT_READ_CHECKS && - !usage(curr, this, excl_bit + LOCK_USAGE_READ_MASK, - state_name(new_bit + LOCK_USAGE_READ_MASK))) + !usage(curr, this, excl_bit + LOCK_USAGE_READ_MASK, + state_name(new_bit + LOCK_USAGE_READ_MASK))) return 0; } @@ -3338,7 +3336,7 @@ static inline unsigned int task_irq_context(struct task_struct *task) } static int separate_irq_context(struct task_struct *curr, - struct held_lock *hlock) + struct held_lock *hlock) { unsigned int depth = curr->lockdep_depth; @@ -3364,14 +3362,14 @@ static int separate_irq_context(struct task_struct *curr, static inline int mark_lock_irq(struct task_struct *curr, struct held_lock *this, - enum lock_usage_bit new_bit) + enum lock_usage_bit new_bit) { WARN_ON(1); /* Impossible innit? when we don't have TRACE_IRQFLAG */ return 1; } static inline int mark_irqflags(struct task_struct *curr, - struct held_lock *hlock) + struct held_lock *hlock) { return 1; } @@ -3382,7 +3380,7 @@ static inline unsigned int task_irq_context(struct task_struct *task) } static inline int separate_irq_context(struct task_struct *curr, - struct held_lock *hlock) + struct held_lock *hlock) { return 0; } @@ -3393,7 +3391,7 @@ static inline int separate_irq_context(struct task_struct *curr, * Mark a lock with a usage bit, and validate the state transition: */ static int mark_lock(struct task_struct *curr, struct held_lock *this, - enum lock_usage_bit new_bit) + enum lock_usage_bit new_bit) { unsigned int new_mask = 1 << new_bit, ret = 1; @@ -3836,7 +3834,7 @@ static struct held_lock *find_held_lock(struct task_struct *curr, } static int reacquire_held_locks(struct task_struct *curr, unsigned int depth, - int idx) + int idx) { struct held_lock *hlock; @@ -4210,8 +4208,8 @@ void lock_downgrade(struct lockdep_map *lock, unsigned long ip) * and also avoid lockdep recursion: */ void lock_acquire(struct lockdep_map *lock, unsigned int subclass, - int trylock, int read, int check, - struct lockdep_map *nest_lock, unsigned long ip) + int trylock, int read, int check, + struct lockdep_map *nest_lock, unsigned long ip) { unsigned long flags; @@ -4230,8 +4228,7 @@ void lock_acquire(struct lockdep_map *lock, unsigned int subclass, } EXPORT_SYMBOL_GPL(lock_acquire); -void lock_release(struct lockdep_map *lock, int nested, - unsigned long ip) +void lock_release(struct lockdep_map *lock, int nested, unsigned long ip) { unsigned long flags; -- 1.8.3.1
| |