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

Commit ad6bbd8b authored by NeilBrown's avatar NeilBrown Committed by Jeff Layton
Browse files

fs/locks: split out __locks_wake_up_blocks(). 



This functionality will be useful in future patches, so
split it out from locks_wake_up_blocks().

Signed-off-by: default avatarNeilBrown <neilb@suse.com>
Reviewed-by: default avatarJ. Bruce Fields <bfields@redhat.com>
Signed-off-by: default avatarJeff Layton <jlayton@kernel.org>
parent ada5c1da

fs/locks.c

+16 −11
Original line number Diff line number Diff line
@@ -672,6 +672,21 @@ static void __locks_delete_block(struct file_lock *waiter) 
	waiter->fl_blocker = NULL;

}



static void __locks_wake_up_blocks(struct file_lock *blocker)

{

	while (!list_empty(&blocker->fl_blocked_requests)) {

		struct file_lock *waiter;



		waiter = list_first_entry(&blocker->fl_blocked_requests,

					  struct file_lock, fl_blocked_member);

		__locks_delete_block(waiter);

		if (waiter->fl_lmops && waiter->fl_lmops->lm_notify)

			waiter->fl_lmops->lm_notify(waiter);

		else

			wake_up(&waiter->fl_wait);

	}

}



static void locks_delete_block(struct file_lock *waiter)

{

	spin_lock(&blocked_lock_lock);
@@ -727,17 +742,7 @@ static void locks_wake_up_blocks(struct file_lock *blocker) 
		return;



	spin_lock(&blocked_lock_lock);

	while (!list_empty(&blocker->fl_blocked_requests)) {

		struct file_lock *waiter;



		waiter = list_first_entry(&blocker->fl_blocked_requests,

				struct file_lock, fl_blocked_member);

		__locks_delete_block(waiter);

		if (waiter->fl_lmops && waiter->fl_lmops->lm_notify)

			waiter->fl_lmops->lm_notify(waiter);

		else

			wake_up(&waiter->fl_wait);

	}

	__locks_wake_up_blocks(blocker);

	spin_unlock(&blocked_lock_lock);

}