[Ocfs2-commits] manish commits r2431 - trunk/fs/ocfs2/dlm

[svn-commits at oss.oracle.com]

Author: manish
Signed-off-by: mfasheh
Date: 2005-06-24 19:59:43 -0500 (Fri, 24 Jun 2005)
New Revision: 2431

Modified:
   trunk/fs/ocfs2/dlm/dlmconvert.c
Log:
Bye bye DLM_ASSERT

Signed-off-by: mfasheh


Modified: trunk/fs/ocfs2/dlm/dlmconvert.c
===================================================================
--- trunk/fs/ocfs2/dlm/dlmconvert.c	2005-06-25 00:12:28 UTC (rev 2430)
+++ trunk/fs/ocfs2/dlm/dlmconvert.c	2005-06-25 00:59:43 UTC (rev 2431)
@@ -460,13 +460,11 @@
 
 	/* see if caller needed to get/put lvb */
 	if (flags & LKM_PUT_LVB) {
-		DLM_ASSERT(!(lksb->flags &
-			     (DLM_LKSB_PUT_LVB|DLM_LKSB_GET_LVB)));
+		BUG_ON(lksb->flags & (DLM_LKSB_PUT_LVB|DLM_LKSB_GET_LVB));
 		lksb->flags |= DLM_LKSB_PUT_LVB;
 		memcpy(&lksb->lvb[0], &cnv->lvb[0], DLM_LVB_LEN);
 	} else if (flags & LKM_GET_LVB) {
-		DLM_ASSERT(!(lksb->flags &
-			     (DLM_LKSB_PUT_LVB|DLM_LKSB_GET_LVB)));
+		BUG_ON(lksb->flags & (DLM_LKSB_PUT_LVB|DLM_LKSB_GET_LVB));
 		lksb->flags |= DLM_LKSB_GET_LVB;
 	}