Commit 9cb16d42 authored by Alexander Aring's avatar Alexander Aring Committed by David Teigland
Browse files

fs: dlm: LSFL_CB_DELAY only for kernel lockspaces 



This patch only set/clear the LSFL_CB_DELAY bit when it's actually a
kernel lockspace signaled by if ls->ls_callback_wq is set or not set in
this case. User lockspaces will never evaluate this flag.

Signed-off-by: default avatarAlexander Aring <aahringo@redhat.com>
Signed-off-by: default avatarDavid Teigland <teigland@redhat.com>
parent 12cda13c

fs/dlm/ast.c

+7 −6
Original line number Diff line number Diff line
@@ -288,13 +288,14 @@ void dlm_callback_stop(struct dlm_ls *ls) 


void dlm_callback_suspend(struct dlm_ls *ls)

{

	if (ls->ls_callback_wq) {

		mutex_lock(&ls->ls_cb_mutex);

		set_bit(LSFL_CB_DELAY, &ls->ls_flags);

		mutex_unlock(&ls->ls_cb_mutex);



	if (ls->ls_callback_wq)

		flush_workqueue(ls->ls_callback_wq);

	}

}



#define MAX_CB_QUEUE 25
@@ -304,11 +305,11 @@ void dlm_callback_resume(struct dlm_ls *ls) 
	int count = 0, sum = 0;

	bool empty;



	clear_bit(LSFL_CB_DELAY, &ls->ls_flags);



	if (!ls->ls_callback_wq)

		return;



	clear_bit(LSFL_CB_DELAY, &ls->ls_flags);



more:

	mutex_lock(&ls->ls_cb_mutex);

	list_for_each_entry_safe(lkb, safe, &ls->ls_cb_delay, lkb_cb_list) {