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

[svn-commits at oss.oracle.com]

Author: mfasheh
Date: 2004-03-29 17:04:14 -0600 (Mon, 29 Mar 2004)
New Revision: 820

Modified:
   trunk/src/nm.c
Log:
* include parts of a patch submitted by <sonic.zhang at intel.com> to do
  better cleanup (including one fix that will avoid a deadlock on an
  error condition)



Modified: trunk/src/nm.c
===================================================================
--- trunk/src/nm.c	2004-03-29 22:48:45 UTC (rev 819)
+++ trunk/src/nm.c	2004-03-29 23:04:14 UTC (rev 820)
@@ -119,6 +119,8 @@
 		OcfsIpcCtxt.recv_sock = NULL;
 	}
 
+	OcfsIpcCtxt.task = NULL;
+
 	/* signal main thread of ipcdlm's exit */
 	complete (&(OcfsIpcCtxt.complete));
 
@@ -409,6 +411,7 @@
 				OCFS_BH_PUT_DATA(bh);
 				status = ocfs_write_bh(osb, bh, 0, NULL);
 				if (status < 0) {
+					up(&(osb->publish_lock));
 					LOG_ERROR_STATUS (status);
 					goto finally;
 				}