Commit ed8625c6 authored by Sunil Mushran's avatar Sunil Mushran
Browse files

ocfs2/dlm: Cleanup dlm_wait_for_node_death() and dlm_wait_for_node_recovery() 



dlm_wait_for_node_death() and dlm_wait_for_node_recovery() needed a facelift.

Signed-off-by: default avatarSunil Mushran <sunil.mushran@oracle.com>
parent e9f0b6a6

fs/ocfs2/dlm/dlmcommon.h

+2 −2
Original line number Diff line number Diff line
@@ -859,8 +859,8 @@ void dlm_complete_recovery_thread(struct dlm_ctxt *dlm); 
void dlm_wait_for_recovery(struct dlm_ctxt *dlm);

void dlm_kick_recovery_thread(struct dlm_ctxt *dlm);

int dlm_is_node_dead(struct dlm_ctxt *dlm, u8 node);

int dlm_wait_for_node_death(struct dlm_ctxt *dlm, u8 node, int timeout);

int dlm_wait_for_node_recovery(struct dlm_ctxt *dlm, u8 node, int timeout);

void dlm_wait_for_node_death(struct dlm_ctxt *dlm, u8 node, int timeout);

void dlm_wait_for_node_recovery(struct dlm_ctxt *dlm, u8 node, int timeout);



void dlm_put(struct dlm_ctxt *dlm);

struct dlm_ctxt *dlm_grab(struct dlm_ctxt *dlm);

fs/ocfs2/dlm/dlmrecovery.c

+22 −24
Original line number Diff line number Diff line
@@ -362,41 +362,39 @@ static int dlm_is_node_recovered(struct dlm_ctxt *dlm, u8 node) 
}





int dlm_wait_for_node_death(struct dlm_ctxt *dlm, u8 node, int timeout)

void dlm_wait_for_node_death(struct dlm_ctxt *dlm, u8 node, int timeout)

{

	if (timeout) {

		mlog(ML_NOTICE, "%s: waiting %dms for notification of "

		     "death of node %u\n", dlm->name, timeout, node);

	if (dlm_is_node_dead(dlm, node))

		return;



	printk(KERN_NOTICE "o2dlm: Waiting on the death of node %u in "

	       "domain %s\n", node, dlm->name);



	if (timeout)

		wait_event_timeout(dlm->dlm_reco_thread_wq,

				   dlm_is_node_dead(dlm, node),

				   msecs_to_jiffies(timeout));

	} else {

		mlog(ML_NOTICE, "%s: waiting indefinitely for notification "

		     "of death of node %u\n", dlm->name, node);

	else

		wait_event(dlm->dlm_reco_thread_wq,

			   dlm_is_node_dead(dlm, node));

}

	/* for now, return 0 */

	return 0;

}



int dlm_wait_for_node_recovery(struct dlm_ctxt *dlm, u8 node, int timeout)

void dlm_wait_for_node_recovery(struct dlm_ctxt *dlm, u8 node, int timeout)

{

	if (timeout) {

		mlog(0, "%s: waiting %dms for notification of "

		     "recovery of node %u\n", dlm->name, timeout, node);

	if (dlm_is_node_recovered(dlm, node))

		return;



	printk(KERN_NOTICE "o2dlm: Waiting on the recovery of node %u in "

	       "domain %s\n", node, dlm->name);



	if (timeout)

		wait_event_timeout(dlm->dlm_reco_thread_wq,

				   dlm_is_node_recovered(dlm, node),

				   msecs_to_jiffies(timeout));

	} else {

		mlog(0, "%s: waiting indefinitely for notification "

		     "of recovery of node %u\n", dlm->name, node);

	else

		wait_event(dlm->dlm_reco_thread_wq,

			   dlm_is_node_recovered(dlm, node));

}

	/* for now, return 0 */

	return 0;

}



/* callers of the top-level api calls (dlmlock/dlmunlock) should

 * block on the dlm->reco.event when recovery is in progress.