[Ocfs2-commits] mfasheh commits r2199 - trunk/fs/ocfs2/cluster

[svn-commits at oss.oracle.com]

Author: mfasheh
Signed-off-by: manish
Date: 2005-04-28 20:41:43 -0500 (Thu, 28 Apr 2005)
New Revision: 2199

Modified:
   trunk/fs/ocfs2/cluster/heartbeat.c
Log:
* cleanup the heartbeat thread properly if we get a signal during
  startup.

Signed-off-by: manish



Modified: trunk/fs/ocfs2/cluster/heartbeat.c
===================================================================
--- trunk/fs/ocfs2/cluster/heartbeat.c	2005-04-29 01:34:12 UTC (rev 2198)
+++ trunk/fs/ocfs2/cluster/heartbeat.c	2005-04-29 01:41:43 UTC (rev 2199)
@@ -1102,9 +1102,13 @@
 
 	ret = wait_event_interruptible(hb_steady_queue,
 				atomic_read(&reg->hr_steady_iterations) == 0);
-	if (ret == 0)
-		ret = count;
+	if (ret) {
+		kthread_stop(reg->hr_task);
+		reg->hr_task = NULL;
+		goto out;
+	}
 
+	ret = count;
 out:
 	if (filp)
 		fput(filp);