Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 663d5af7 authored by Daniel Wagner's avatar Daniel Wagner Committed by Jeff Layton
Browse files

locks: Add lockdep assertion for blocked_lock_lock 



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

Signed-off-by: default avatarDaniel Wagner <daniel.wagner@bmw-carit.de>
Signed-off-by: default avatarJeff Layton <jeff.layton@primarydata.com>
parent 9b8c8695

fs/locks.c

+6 −0
Original line number Diff line number Diff line
@@ -592,11 +592,15 @@ posix_owner_key(struct file_lock *fl) 


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));

}



static void locks_delete_global_blocked(struct file_lock *waiter)

{

	lockdep_assert_held(&blocked_lock_lock);



	hash_del(&waiter->fl_link);

}
@@ -838,6 +842,8 @@ static int posix_locks_deadlock(struct file_lock *caller_fl, 
{

	int i = 0;



	lockdep_assert_held(&blocked_lock_lock);



	/*

	 * This deadlock detector can't reasonably detect deadlocks with

	 * FL_OFDLCK locks, since they aren't owned by a process, per-se.