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

fs: dlm: convert ls_cb_mutex mutex to spinlock 



This patch converts the ls_cb_mutex mutex to a spinlock, there is no
sleepable context when this lock is held.

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

fs/dlm/ast.c

+6 −6
Original line number Original line Diff line number Diff line
@@ -200,13 +200,13 @@ void dlm_add_cb(struct dlm_lkb *lkb, uint32_t flags, int mode, int status, 
	if (!prev_seq) {

	if (!prev_seq) {

		kref_get(&lkb->lkb_ref);

		kref_get(&lkb->lkb_ref);





		mutex_lock(&ls->ls_cb_mutex);

		spin_lock(&ls->ls_cb_lock);

		if (test_bit(LSFL_CB_DELAY, &ls->ls_flags)) {

		if (test_bit(LSFL_CB_DELAY, &ls->ls_flags)) {

			list_add(&lkb->lkb_cb_list, &ls->ls_cb_delay);

			list_add(&lkb->lkb_cb_list, &ls->ls_cb_delay);

		} else {

		} else {

			queue_work(ls->ls_callback_wq, &lkb->lkb_cb_work);

			queue_work(ls->ls_callback_wq, &lkb->lkb_cb_work);

		}

		}

		mutex_unlock(&ls->ls_cb_mutex);

		spin_unlock(&ls->ls_cb_lock);

	}

	}

 out:

 out:

	mutex_unlock(&lkb->lkb_cb_mutex);

	mutex_unlock(&lkb->lkb_cb_mutex);
@@ -289,9 +289,9 @@ void dlm_callback_stop(struct dlm_ls *ls) 
void dlm_callback_suspend(struct dlm_ls *ls)

void dlm_callback_suspend(struct dlm_ls *ls)

{

{

	if (ls->ls_callback_wq) {

	if (ls->ls_callback_wq) {

		mutex_lock(&ls->ls_cb_mutex);

		spin_lock(&ls->ls_cb_lock);

		set_bit(LSFL_CB_DELAY, &ls->ls_flags);

		set_bit(LSFL_CB_DELAY, &ls->ls_flags);

		mutex_unlock(&ls->ls_cb_mutex);

		spin_unlock(&ls->ls_cb_lock);





		flush_workqueue(ls->ls_callback_wq);

		flush_workqueue(ls->ls_callback_wq);

	}

	}
@@ -309,7 +309,7 @@ void dlm_callback_resume(struct dlm_ls *ls) 
		return;

		return;





more:

more:

	mutex_lock(&ls->ls_cb_mutex);

	spin_lock(&ls->ls_cb_lock);

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

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

		list_del_init(&lkb->lkb_cb_list);

		list_del_init(&lkb->lkb_cb_list);

		queue_work(ls->ls_callback_wq, &lkb->lkb_cb_work);

		queue_work(ls->ls_callback_wq, &lkb->lkb_cb_work);
@@ -320,7 +320,7 @@ void dlm_callback_resume(struct dlm_ls *ls) 
	empty = list_empty(&ls->ls_cb_delay);

	empty = list_empty(&ls->ls_cb_delay);

	if (empty)

	if (empty)

		clear_bit(LSFL_CB_DELAY, &ls->ls_flags);

		clear_bit(LSFL_CB_DELAY, &ls->ls_flags);

	mutex_unlock(&ls->ls_cb_mutex);

	spin_unlock(&ls->ls_cb_lock);





	sum += count;

	sum += count;

	if (!empty) {

	if (!empty) {

fs/dlm/dlm_internal.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -631,7 +631,7 @@ struct dlm_ls { 




	/* recovery related */

	/* recovery related */





	struct mutex		ls_cb_mutex;

	spinlock_t		ls_cb_lock;

	struct list_head	ls_cb_delay; /* save for queue_work later */

	struct list_head	ls_cb_delay; /* save for queue_work later */

	struct timer_list	ls_timer;

	struct timer_list	ls_timer;

	struct task_struct	*ls_recoverd_task;

	struct task_struct	*ls_recoverd_task;

fs/dlm/lockspace.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -567,7 +567,7 @@ static int new_lockspace(const char *name, const char *cluster, 
	init_completion(&ls->ls_recovery_done);

	init_completion(&ls->ls_recovery_done);

	ls->ls_recovery_result = -1;

	ls->ls_recovery_result = -1;





	mutex_init(&ls->ls_cb_mutex);

	spin_lock_init(&ls->ls_cb_lock);

	INIT_LIST_HEAD(&ls->ls_cb_delay);

	INIT_LIST_HEAD(&ls->ls_cb_delay);





	ls->ls_recoverd_task = NULL;

	ls->ls_recoverd_task = NULL;