[Ocfs2-commits] smushran commits r3085 - branches/ocfs2-1.2/fs/ocfs2/dlm

[svn-commits at oss.oracle.com]

Author: smushran
Date: 2008-05-02 14:18:08 -0700 (Fri, 02 May 2008)
New Revision: 3085

Modified:
   branches/ocfs2-1.2/fs/ocfs2/dlm/dlmconvert.c
   branches/ocfs2-1.2/fs/ocfs2/dlm/dlmmaster.c
   branches/ocfs2-1.2/fs/ocfs2/dlm/dlmrecovery.c
Log:
ocfs2: Use dlm_print_one_lock_resource for lock resource print

Mainline commit 2af37ce82d199d1d8cd6286f42f37d321627a807
Author: Tao Ma <tao.ma at oracle.com>
Date: Thu, 28 Feb 2008 10:41:55 +0800

__dlm_print_one_lock_resource must be called with spin_lock
the res->spinlock. While in some cases, we use it without this
precondition and lead to the failure of assert_spin_locked.
So call dlm_print_one_lock_resource instead.

Signed-off-by: jlbec

Modified: branches/ocfs2-1.2/fs/ocfs2/dlm/dlmconvert.c
===================================================================
--- branches/ocfs2-1.2/fs/ocfs2/dlm/dlmconvert.c	2008-05-02 21:15:10 UTC (rev 3084)
+++ branches/ocfs2-1.2/fs/ocfs2/dlm/dlmconvert.c	2008-05-02 21:18:08 UTC (rev 3085)
@@ -490,7 +490,7 @@
 			       "cookie=%u:%llu\n",
 			       dlm_get_lock_cookie_node(be64_to_cpu(cnv->cookie)),
 			       dlm_get_lock_cookie_seq(be64_to_cpu(cnv->cookie)));
-		__dlm_print_one_lock_resource(res);
+		dlm_print_one_lock_resource(res);
 		goto leave;
 	}
 

Modified: branches/ocfs2-1.2/fs/ocfs2/dlm/dlmmaster.c
===================================================================
--- branches/ocfs2-1.2/fs/ocfs2/dlm/dlmmaster.c	2008-05-02 21:15:10 UTC (rev 3084)
+++ branches/ocfs2-1.2/fs/ocfs2/dlm/dlmmaster.c	2008-05-02 21:18:08 UTC (rev 3085)
@@ -2412,7 +2412,7 @@
 		mlog(ML_ERROR, "%s:%.*s: node %u trying to drop ref "
 		     "but it is already dropped!\n", dlm->name,
 		     res->lockname.len, res->lockname.name, node);
-		__dlm_print_one_lock_resource(res);
+		dlm_print_one_lock_resource(res);
 	}
 
 	dlm_lockres_put(res);

Modified: branches/ocfs2-1.2/fs/ocfs2/dlm/dlmrecovery.c
===================================================================
--- branches/ocfs2-1.2/fs/ocfs2/dlm/dlmrecovery.c	2008-05-02 21:15:10 UTC (rev 3084)
+++ branches/ocfs2-1.2/fs/ocfs2/dlm/dlmrecovery.c	2008-05-02 21:18:08 UTC (rev 3085)
@@ -1199,7 +1199,7 @@
 			    (ml->type == LKM_EXMODE ||
 			     memcmp(mres->lvb, lock->lksb->lvb, DLM_LVB_LEN))) {
 				mlog(ML_ERROR, "mismatched lvbs!\n");
-				__dlm_print_one_lock_resource(lock->lockres);
+				dlm_print_one_lock_resource(lock->lockres);
 				BUG();
 			}
 			memcpy(mres->lvb, lock->lksb->lvb, DLM_LVB_LEN);