p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

locks: Add lockdep assertion for blocked_lock_lock 

Annonate insert, remove and iterate function that we need
blocked_lock_lock held.

Signed-off-by: Daniel Wagner <daniel.wagner@bmw-carit.de>
Signed-off-by: Jeff Layton <jeff.layton@primarydata.com>
This commit is contained in:
Daniel Wagner 2015-04-03 09:04:03 -04:00 committed by Jeff Layton
parent 9b8c86956d
commit 663d5af750
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
fs/locks.c
View File

@ -592,11 +592,15 @@ posix_owner_key(struct file_lock *fl)
static void locks_insert_global_blocked(struct file_lock *waiter) static void locks_insert_global_blocked(struct file_lock *waiter)
{ {
lockdep_assert_held(&blocked_lock_lock);
hash_add(blocked_hash, &waiter->fl_link, posix_owner_key(waiter)); hash_add(blocked_hash, &waiter->fl_link, posix_owner_key(waiter));
} }
static void locks_delete_global_blocked(struct file_lock *waiter) static void locks_delete_global_blocked(struct file_lock *waiter)
{ {
lockdep_assert_held(&blocked_lock_lock);
hash_del(&waiter->fl_link); hash_del(&waiter->fl_link);
} }
@ -838,6 +842,8 @@ static int posix_locks_deadlock(struct file_lock *caller_fl,
{ {
int i = 0; int i = 0;
lockdep_assert_held(&blocked_lock_lock);
/* /*
* This deadlock detector can't reasonably detect deadlocks with * This deadlock detector can't reasonably detect deadlocks with
* FL_OFDLCK locks, since they aren't owned by a process, per-se. * FL_OFDLCK locks, since they aren't owned by a process, per-se.