[Ocfs2-commits] mfasheh commits r1411 - trunk/src

[svn-commits at oss.oracle.com]

Author: mfasheh
Date: 2004-09-01 11:27:03 -0500 (Wed, 01 Sep 2004)
New Revision: 1411

Modified:
   trunk/src/inode.c
Log:
* make the output before our BUG in ocfs_find_actor and
  ocfs_find_inode more descriptive. This should help us track down the
  bug faster.



Modified: trunk/src/inode.c
===================================================================
--- trunk/src/inode.c	2004-09-01 16:22:28 UTC (rev 1410)
+++ trunk/src/inode.c	2004-09-01 16:27:03 UTC (rev 1411)
@@ -178,17 +178,21 @@
 
 	LOG_ENTRY_ARGS ("(0x%p, %lu, %llu, 0x%p)\n", inode, inode->i_ino, OCFS_I(inode)->ip_blkno, opaque);
 
+	args = opaque;
+
 	if (!inode->u.generic_ip) {
 		LOG_ERROR_ARGS("inode %lu has no generic_ip (is_bad_inode = "
 			       "%d)!\n", inode->i_ino, is_bad_inode(inode));
+		if (args)
+			LOG_ERROR_ARGS("args-blkno = %llu, args->ino = %lu, "
+				       "args->flags = 0x%x\n", args->blkno, 
+				       args->ino, args->flags);
 		BUG();
 	}
 
 	if (inode == NULL)
 		goto bail;
 
-	args = opaque;
-
 	if (OCFS_I(inode)->ip_blkno != args->blkno) {
 		LOG_ERROR_ARGS("hmm ip_blkno=%llu, args->blkno=%llu, i_ino=%lu\n",
 			       OCFS_I(inode)->ip_blkno, args->blkno, inode->i_ino);
@@ -238,10 +242,16 @@
 	int ret = 0;
 
 	LOG_ENTRY_ARGS ("(0x%p, %lu, 0x%p)\n", inode, ino, opaque);
-	
+
+	args = opaque;
+
 	if (!inode->u.generic_ip) {
 		LOG_ERROR_ARGS("inode %lu has no generic_ip (is_bad_inode = "
 			       "%d)!\n", inode->i_ino, is_bad_inode(inode));
+		if (args)
+			LOG_ERROR_ARGS("args-blkno = %llu, args->ino = %lu, "
+				       "args->flags = 0x%x\n", args->blkno, 
+				       args->ino, args->flags);
 		BUG();
 	}
 
@@ -250,8 +260,6 @@
 	if (opaque == NULL || inode == NULL)
 		goto bail;
 
-	args = opaque;
-
 	if (OCFS_I(inode)->ip_blkno != args->blkno) {
 		LOG_ERROR_STATUS(-EINVAL);
 		goto bail;