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

[svn-commits at oss.oracle.com]

Author: mfasheh
Date: 2004-07-26 21:08:11 -0500 (Mon, 26 Jul 2004)
New Revision: 1306

Modified:
   trunk/src/dlm.c
Log:
* add an assert which might catch potential bugs

* fix a comment typo

* add a warning in release_lock_full



Modified: trunk/src/dlm.c
===================================================================
--- trunk/src/dlm.c	2004-07-27 02:06:03 UTC (rev 1305)
+++ trunk/src/dlm.c	2004-07-27 02:08:11 UTC (rev 1306)
@@ -1012,6 +1012,7 @@
 	status = 0;
 
 skip_lock_write:
+	OCFS_ASSERT(status == 0);
 	lockres->lock_holders++;
 	LOG_TRACE_ARGS("lockres->lock_holders = %u\n", lockres->lock_holders);
 	ocfs_release_lockres (lockres); // ocfs_acquire_lock
@@ -1270,12 +1271,13 @@
 		       "= %llu\n", lock_id);
 		BUG();
 	}
+#warning "is this wise, or shouldn't we be retrying the lock release later?"
 	lockres->lock_holders -= num_ident;
 	LOG_TRACE_ARGS("lockres->lock_holders = %u\n", lockres->lock_holders);
 	ocfs_release_lockres (lockres); // ocfs_release_lock
 	LOG_EXIT_STATUS (status);
 	return (status);
-}				/* ocfs_release_lock */
+}				/* ocfs_release_lock_full */
 
 /* inode is definitely non NULL */
 int new_lock_function(ocfs_super * osb, __u32 requested_lock, __u32 flags, struct buffer_head *bh, int *disk_vote, struct inode *inode)	
@@ -1388,7 +1390,8 @@
 			goto try_net_again;
 		}
 		else if (status == -EINTR && ocfs_task_interruptible (osb)) {
-			LOG_ERROR_STR("interrupted!\n");
+			LOG_ERROR_ARGS("interrupted! (lock_id = %llu)\n",
+				       lock_id);
 			goto bail;
 		} else 
 			LOG_ERROR_STATUS (status);