[Ocfs2-commits] mfasheh commits r1514 - branches/dlm-changes/src

[svn-commits at oss.oracle.com]

Author: mfasheh
Date: 2004-09-29 19:02:24 -0500 (Wed, 29 Sep 2004)
New Revision: 1514

Modified:
   branches/dlm-changes/src/dlm.c
Log:
* we shouldn't be taking cluster locks inside transactions from now
  on.



Modified: branches/dlm-changes/src/dlm.c
===================================================================
--- branches/dlm-changes/src/dlm.c	2004-09-29 23:59:58 UTC (rev 1513)
+++ branches/dlm-changes/src/dlm.c	2004-09-30 00:02:24 UTC (rev 1514)
@@ -208,6 +208,7 @@
 	OCFS_ASSERT(lock_type != OCFS_LKM_NLMODE);
 	OCFS_ASSERT(inode);
 	OCFS_ASSERT(bh);
+	OCFS_ASSERT(!journal_current_handle());
 
 	lock_id = OCFS_I(inode)->ip_blkno << inode->i_sb->s_blocksize_bits;
 	LOG_TRACE_ARGS("lock_id = %llu\n", lock_id);