[Ocfs2-commits] khackel commits r2715 - trunk/fs/ocfs2/dlm

[svn-commits at oss.oracle.com]

Author: khackel
Signed-off-by: mfasheh
Date: 2005-12-07 01:19:42 -0600 (Wed, 07 Dec 2005)
New Revision: 2715

Modified:
   trunk/fs/ocfs2/dlm/dlmmaster.c
Log:
* fixes crash in debug mle printing code

Signed-off-by: mfasheh



Modified: trunk/fs/ocfs2/dlm/dlmmaster.c
===================================================================
--- trunk/fs/ocfs2/dlm/dlmmaster.c	2005-12-07 07:15:05 UTC (rev 2714)
+++ trunk/fs/ocfs2/dlm/dlmmaster.c	2005-12-07 07:19:42 UTC (rev 2715)
@@ -140,12 +140,17 @@
 	struct kref *k;
 
 	k = &mle->mle_refs;
-	type = (mle->type == DLM_MLE_BLOCK ? "BLK" : "MAS");
+	if (mle->type == DLM_MLE_BLOCK)
+		type = "BLK";
+	else if (mle->type == DLM_MLE_MASTER)
+		type = "MAS";
+	else
+		type = "MIG";
 	refs = atomic_read(&k->refcount);
 	master = mle->master;
 	attached = (list_empty(&mle->hb_events) ? 'N' : 'Y');
 
-	if (mle->type == DLM_MLE_BLOCK) {
+	if (mle->type != DLM_MLE_MASTER) {
 		namelen = mle->u.name.len;
 		name = mle->u.name.name;
 	} else {
@@ -481,7 +486,7 @@
 	mle = container_of(kref, struct dlm_master_list_entry, mle_refs);
 	dlm = mle->dlm;
 
-	if (mle->type == DLM_MLE_BLOCK) {
+	if (mle->type != DLM_MLE_MASTER) {
 		mlog(0, "calling mle_release for %.*s, type %d\n",
 		     mle->u.name.len, mle->u.name.name, mle->type);
 	} else {
@@ -1144,7 +1149,7 @@
 
 	BUG_ON(mle->type == DLM_MLE_MIGRATION);
 
-	if (mle->type == DLM_MLE_BLOCK) {
+	if (mle->type != DLM_MLE_MASTER) {
 		request.namelen = mle->u.name.len;
 		memcpy(request.name, mle->u.name.name, request.namelen);
 	} else {