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

dlm: use LSFL_FS to check for kernel lockspace 



The existing external lockspace flag DLM_LSFL_FS is now also
saved as an internal flag LSFL_FS, so it can be checked from
other code locations which want to know if a lockspace is
used from the kernel or user space.

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

fs/dlm/ast.c

+11 −6
Original line number Diff line number Diff line
@@ -161,6 +161,9 @@ void dlm_add_cb(struct dlm_lkb *lkb, uint32_t flags, int mode, int status, 


int dlm_callback_start(struct dlm_ls *ls)

{

	if (!test_bit(LSFL_FS, &ls->ls_flags))

		return 0;



	ls->ls_callback_wq = alloc_ordered_workqueue("dlm_callback",

						     WQ_HIGHPRI | WQ_MEM_RECLAIM);

	if (!ls->ls_callback_wq) {
@@ -178,14 +181,16 @@ void dlm_callback_stop(struct dlm_ls *ls) 


void dlm_callback_suspend(struct dlm_ls *ls)

{

	if (ls->ls_callback_wq) {

	if (!test_bit(LSFL_FS, &ls->ls_flags))

		return;



	spin_lock_bh(&ls->ls_cb_lock);

	set_bit(LSFL_CB_DELAY, &ls->ls_flags);

	spin_unlock_bh(&ls->ls_cb_lock);



	if (ls->ls_callback_wq)

		flush_workqueue(ls->ls_callback_wq);

}

}



#define MAX_CB_QUEUE 25
@@ -195,7 +200,7 @@ void dlm_callback_resume(struct dlm_ls *ls) 
	int count = 0, sum = 0;

	bool empty;



	if (!ls->ls_callback_wq)

	if (!test_bit(LSFL_FS, &ls->ls_flags))

		return;



more:

fs/dlm/dlm_internal.h

+1 −0
Original line number Diff line number Diff line
@@ -698,6 +698,7 @@ struct dlm_ls { 
#define LSFL_CB_DELAY		9

#define LSFL_NODIR		10

#define LSFL_RECV_MSG_BLOCKED	11

#define LSFL_FS			12



#define DLM_PROC_FLAGS_CLOSING 1

#define DLM_PROC_FLAGS_COMPAT  2

fs/dlm/lockspace.c

+7 −6
Original line number Diff line number Diff line
@@ -499,13 +499,14 @@ static int new_lockspace(const char *name, const char *cluster, 
	list_add(&ls->ls_list, &lslist);

	spin_unlock_bh(&lslist_lock);



	if (flags & DLM_LSFL_FS) {

	if (flags & DLM_LSFL_FS)

		set_bit(LSFL_FS, &ls->ls_flags);



	error = dlm_callback_start(ls);

	if (error) {

		log_error(ls, "can't start dlm_callback %d", error);

		goto out_delist;

	}

	}



	init_waitqueue_head(&ls->ls_recover_lock_wait);