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

Commit cf0acdcd authored by Joel Becker's avatar Joel Becker Committed by Mark Fasheh
Browse files

ocfs2: Abstract out a debugging function for underlying dlms. 



dlmglue.c was still referencing a raw o2dlm lksb in one instance.  Let's
create a generic ocfs2_dlm_dump_lksb() function.  This allows underlying
DLMs to print whatever they want about their lock.

We then move the o2dlm dump into stackglue.c where it belongs.

Signed-off-by: default avatarJoel Becker <joel.becker@oracle.com>
Signed-off-by: default avatarMark Fasheh <mfasheh@suse.com>
parent 1693a5c0

fs/ocfs2/dlmglue.c

+1 −2
Original line number Diff line number Diff line
@@ -2803,8 +2803,7 @@ static int ocfs2_drop_lock(struct ocfs2_super *osb, 
	if (ret) {

		ocfs2_log_dlm_error("ocfs2_dlm_unlock", ret, lockres);

		mlog(ML_ERROR, "lockres flags: %lu\n", lockres->l_flags);

		/* XXX Need to abstract this */

		dlm_print_one_lock(lockres->l_lksb.lksb_o2dlm.lockid);

		ocfs2_dlm_dump_lksb(&lockres->l_lksb);

		BUG();

	}

	mlog(0, "lock %s, successfull return from ocfs2_dlm_unlock\n",

fs/ocfs2/stackglue.c

+5 −0
Original line number Diff line number Diff line
@@ -252,6 +252,11 @@ void *ocfs2_dlm_lvb(union ocfs2_dlm_lksb *lksb) 
	return (void *)(lksb->lksb_o2dlm.lvb);

}



void ocfs2_dlm_dump_lksb(union ocfs2_dlm_lksb *lksb)

{

	dlm_print_one_lock(lksb->lksb_o2dlm.lockid);

}



/*

 * Called from the dlm when it's about to evict a node. This is how the

 * classic stack signals node death.

fs/ocfs2/stackglue.h

+1 −0
Original line number Diff line number Diff line
@@ -91,6 +91,7 @@ int ocfs2_dlm_unlock(struct ocfs2_cluster_connection *conn, 


int ocfs2_dlm_lock_status(union ocfs2_dlm_lksb *lksb);

void *ocfs2_dlm_lvb(union ocfs2_dlm_lksb *lksb);

void ocfs2_dlm_dump_lksb(union ocfs2_dlm_lksb *lksb);



void o2cb_get_stack(struct ocfs2_locking_protocol *proto);

void o2cb_put_stack(void);