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

Commit 85e86edf authored by David Teigland's avatar David Teigland Committed by Steven Whitehouse
Browse files

[DLM] block scand during recovery [1/6] 



Don't let dlm_scand run during recovery since it may try to do a resource
directory removal while the directory nodes are changing.

Signed-off-by: default avatarDavid Teigland <teigland@redhat.com>
Signed-off-by: default avatarSteven Whitehouse <swhiteho@redhat.com>
parent 916297aa

fs/dlm/lock.c

+23 −24
Original line number Original line Diff line number Diff line
@@ -194,17 +194,17 @@ void dlm_dump_rsb(struct dlm_rsb *r) 




/* Threads cannot use the lockspace while it's being recovered */

/* Threads cannot use the lockspace while it's being recovered */





static inline void lock_recovery(struct dlm_ls *ls)

static inline void dlm_lock_recovery(struct dlm_ls *ls)

{

{

	down_read(&ls->ls_in_recovery);

	down_read(&ls->ls_in_recovery);

}

}





static inline void unlock_recovery(struct dlm_ls *ls)

void dlm_unlock_recovery(struct dlm_ls *ls)

{

{

	up_read(&ls->ls_in_recovery);

	up_read(&ls->ls_in_recovery);

}

}





static inline int lock_recovery_try(struct dlm_ls *ls)

int dlm_lock_recovery_try(struct dlm_ls *ls)

{

{

	return down_read_trylock(&ls->ls_in_recovery);

	return down_read_trylock(&ls->ls_in_recovery);

}

}
@@ -985,11 +985,10 @@ void dlm_scan_rsbs(struct dlm_ls *ls) 
{

{

	int i;

	int i;





	if (dlm_locking_stopped(ls))

		return;



	for (i = 0; i < ls->ls_rsbtbl_size; i++) {

	for (i = 0; i < ls->ls_rsbtbl_size; i++) {

		shrink_bucket(ls, i);

		shrink_bucket(ls, i);

		if (dlm_locking_stopped(ls))

			break;

		cond_resched();

		cond_resched();

	}

	}

}

}
@@ -2274,7 +2273,7 @@ int dlm_lock(dlm_lockspace_t *lockspace, 
	if (!ls)

	if (!ls)

		return -EINVAL;

		return -EINVAL;





	lock_recovery(ls);

	dlm_lock_recovery(ls);





	if (convert)

	if (convert)

		error = find_lkb(ls, lksb->sb_lkid, &lkb);

		error = find_lkb(ls, lksb->sb_lkid, &lkb);
@@ -2302,7 +2301,7 @@ int dlm_lock(dlm_lockspace_t *lockspace, 
	if (error == -EAGAIN)

	if (error == -EAGAIN)

		error = 0;

		error = 0;

 out:

 out:

	unlock_recovery(ls);

	dlm_unlock_recovery(ls);

	dlm_put_lockspace(ls);

	dlm_put_lockspace(ls);

	return error;

	return error;

}

}
@@ -2322,7 +2321,7 @@ int dlm_unlock(dlm_lockspace_t *lockspace, 
	if (!ls)

	if (!ls)

		return -EINVAL;

		return -EINVAL;





	lock_recovery(ls);

	dlm_lock_recovery(ls);





	error = find_lkb(ls, lkid, &lkb);

	error = find_lkb(ls, lkid, &lkb);

	if (error)

	if (error)
@@ -2344,7 +2343,7 @@ int dlm_unlock(dlm_lockspace_t *lockspace, 
 out_put:

 out_put:

	dlm_put_lkb(lkb);

	dlm_put_lkb(lkb);

 out:

 out:

	unlock_recovery(ls);

	dlm_unlock_recovery(ls);

	dlm_put_lockspace(ls);

	dlm_put_lockspace(ls);

	return error;

	return error;

}

}
@@ -3424,7 +3423,7 @@ int dlm_receive_message(struct dlm_header *hd, int nodeid, int recovery) 
			}

			}

		}

		}





		if (lock_recovery_try(ls))

		if (dlm_lock_recovery_try(ls))

			break;

			break;

		schedule();

		schedule();

	}

	}
@@ -3503,7 +3502,7 @@ int dlm_receive_message(struct dlm_header *hd, int nodeid, int recovery) 
		log_error(ls, "unknown message type %d", ms->m_type);

		log_error(ls, "unknown message type %d", ms->m_type);

	}

	}





	unlock_recovery(ls);

	dlm_unlock_recovery(ls);

 out:

 out:

	dlm_put_lockspace(ls);

	dlm_put_lockspace(ls);

	dlm_astd_wake();

	dlm_astd_wake();
@@ -4040,7 +4039,7 @@ int dlm_user_request(struct dlm_ls *ls, struct dlm_user_args *ua, 
	struct dlm_args args;

	struct dlm_args args;

	int error;

	int error;





	lock_recovery(ls);

	dlm_lock_recovery(ls);





	error = create_lkb(ls, &lkb);

	error = create_lkb(ls, &lkb);

	if (error) {

	if (error) {
@@ -4094,7 +4093,7 @@ int dlm_user_request(struct dlm_ls *ls, struct dlm_user_args *ua, 
	list_add_tail(&lkb->lkb_ownqueue, &ua->proc->locks);

	list_add_tail(&lkb->lkb_ownqueue, &ua->proc->locks);

	spin_unlock(&ua->proc->locks_spin);

	spin_unlock(&ua->proc->locks_spin);

 out:

 out:

	unlock_recovery(ls);

	dlm_unlock_recovery(ls);

	return error;

	return error;

}

}
@@ -4106,7 +4105,7 @@ int dlm_user_convert(struct dlm_ls *ls, struct dlm_user_args *ua_tmp, 
	struct dlm_user_args *ua;

	struct dlm_user_args *ua;

	int error;

	int error;





	lock_recovery(ls);

	dlm_lock_recovery(ls);





	error = find_lkb(ls, lkid, &lkb);

	error = find_lkb(ls, lkid, &lkb);

	if (error)

	if (error)
@@ -4146,7 +4145,7 @@ int dlm_user_convert(struct dlm_ls *ls, struct dlm_user_args *ua_tmp, 
 out_put:

 out_put:

	dlm_put_lkb(lkb);

	dlm_put_lkb(lkb);

 out:

 out:

	unlock_recovery(ls);

	dlm_unlock_recovery(ls);

	kfree(ua_tmp);

	kfree(ua_tmp);

	return error;

	return error;

}

}
@@ -4159,7 +4158,7 @@ int dlm_user_unlock(struct dlm_ls *ls, struct dlm_user_args *ua_tmp, 
	struct dlm_user_args *ua;

	struct dlm_user_args *ua;

	int error;

	int error;





	lock_recovery(ls);

	dlm_lock_recovery(ls);





	error = find_lkb(ls, lkid, &lkb);

	error = find_lkb(ls, lkid, &lkb);

	if (error)

	if (error)
@@ -4194,7 +4193,7 @@ int dlm_user_unlock(struct dlm_ls *ls, struct dlm_user_args *ua_tmp, 
 out_put:

 out_put:

	dlm_put_lkb(lkb);

	dlm_put_lkb(lkb);

 out:

 out:

	unlock_recovery(ls);

	dlm_unlock_recovery(ls);

	kfree(ua_tmp);

	kfree(ua_tmp);

	return error;

	return error;

}

}
@@ -4207,7 +4206,7 @@ int dlm_user_cancel(struct dlm_ls *ls, struct dlm_user_args *ua_tmp, 
	struct dlm_user_args *ua;

	struct dlm_user_args *ua;

	int error;

	int error;





	lock_recovery(ls);

	dlm_lock_recovery(ls);





	error = find_lkb(ls, lkid, &lkb);

	error = find_lkb(ls, lkid, &lkb);

	if (error)

	if (error)
@@ -4231,7 +4230,7 @@ int dlm_user_cancel(struct dlm_ls *ls, struct dlm_user_args *ua_tmp, 
 out_put:

 out_put:

	dlm_put_lkb(lkb);

	dlm_put_lkb(lkb);

 out:

 out:

	unlock_recovery(ls);

	dlm_unlock_recovery(ls);

	kfree(ua_tmp);

	kfree(ua_tmp);

	return error;

	return error;

}

}
@@ -4314,7 +4313,7 @@ void dlm_clear_proc_locks(struct dlm_ls *ls, struct dlm_user_proc *proc) 
{

{

	struct dlm_lkb *lkb, *safe;

	struct dlm_lkb *lkb, *safe;





	lock_recovery(ls);

	dlm_lock_recovery(ls);





	while (1) {

	while (1) {

		lkb = del_proc_lock(ls, proc);

		lkb = del_proc_lock(ls, proc);
@@ -4347,7 +4346,7 @@ void dlm_clear_proc_locks(struct dlm_ls *ls, struct dlm_user_proc *proc) 
	}

	}





	mutex_unlock(&ls->ls_clear_proc_locks);

	mutex_unlock(&ls->ls_clear_proc_locks);

	unlock_recovery(ls);

	dlm_unlock_recovery(ls);

}

}





static void purge_proc_locks(struct dlm_ls *ls, struct dlm_user_proc *proc)

static void purge_proc_locks(struct dlm_ls *ls, struct dlm_user_proc *proc)
@@ -4429,12 +4428,12 @@ int dlm_user_purge(struct dlm_ls *ls, struct dlm_user_proc *proc, 
	if (nodeid != dlm_our_nodeid()) {

	if (nodeid != dlm_our_nodeid()) {

		error = send_purge(ls, nodeid, pid);

		error = send_purge(ls, nodeid, pid);

	} else {

	} else {

		lock_recovery(ls);

		dlm_lock_recovery(ls);

		if (pid == current->pid)

		if (pid == current->pid)

			purge_proc_locks(ls, proc);

			purge_proc_locks(ls, proc);

		else

		else

			do_purge(ls, nodeid, pid);

			do_purge(ls, nodeid, pid);

		unlock_recovery(ls);

		dlm_unlock_recovery(ls);

	}

	}

	return error;

	return error;

}

}

fs/dlm/lock.h

+2 −0
Original line number Original line Diff line number Diff line
@@ -24,6 +24,8 @@ void dlm_put_rsb(struct dlm_rsb *r); 
void dlm_hold_rsb(struct dlm_rsb *r);

void dlm_hold_rsb(struct dlm_rsb *r);

int dlm_put_lkb(struct dlm_lkb *lkb);

int dlm_put_lkb(struct dlm_lkb *lkb);

void dlm_scan_rsbs(struct dlm_ls *ls);

void dlm_scan_rsbs(struct dlm_ls *ls);

int dlm_lock_recovery_try(struct dlm_ls *ls);

void dlm_unlock_recovery(struct dlm_ls *ls);





int dlm_purge_locks(struct dlm_ls *ls);

int dlm_purge_locks(struct dlm_ls *ls);

void dlm_purge_mstcpy_locks(struct dlm_rsb *r);

void dlm_purge_mstcpy_locks(struct dlm_rsb *r);

fs/dlm/lockspace.c

+6 −2
Original line number Original line Diff line number Diff line
@@ -234,8 +234,12 @@ static int dlm_scand(void *data) 
	struct dlm_ls *ls;

	struct dlm_ls *ls;





	while (!kthread_should_stop()) {

	while (!kthread_should_stop()) {

		list_for_each_entry(ls, &lslist, ls_list)

		list_for_each_entry(ls, &lslist, ls_list) {

			if (dlm_lock_recovery_try(ls)) {

				dlm_scan_rsbs(ls);

				dlm_scan_rsbs(ls);

				dlm_unlock_recovery(ls);

			}

		}

		schedule_timeout_interruptible(dlm_config.ci_scan_secs * HZ);

		schedule_timeout_interruptible(dlm_config.ci_scan_secs * HZ);

	}

	}

	return 0;

	return 0;