[Ocfs2-commits] khackel commits r2810 - branches/ocfs2-1.2-cert/patches

[svn-commits@oss.oracle.com]

Author: khackel
Signed-off-by: jlbec
Date: 2006-04-03 01:27:12 -0500 (Mon, 03 Apr 2006)
New Revision: 2810

Modified:
   branches/ocfs2-1.2-cert/patches/lame-timeout-dbg.patch
   branches/ocfs2-1.2-cert/patches/series
Log:
add lame-timeout-dbg.patch
Signed-off-by: jlbec

Modified: branches/ocfs2-1.2-cert/patches/lame-timeout-dbg.patch
===================================================================
--- branches/ocfs2-1.2-cert/patches/lame-timeout-dbg.patch	2006-04-03 03:21:22 UTC (rev 2809)
+++ branches/ocfs2-1.2-cert/patches/lame-timeout-dbg.patch	2006-04-03 06:27:12 UTC (rev 2810)
@@ -1,7 +1,7 @@
 Index: cert2/fs/ocfs2/cluster/tcp.c
 ===================================================================
---- cert2.orig/fs/ocfs2/cluster/tcp.c	2006-04-02 17:30:26.179683000 -0700
-+++ cert2/fs/ocfs2/cluster/tcp.c	2006-04-02 17:48:23.418006000 -0700
+--- cert2.orig/fs/ocfs2/cluster/tcp.c	2006-04-02 23:16:18.812357000 -0700
++++ cert2/fs/ocfs2/cluster/tcp.c	2006-04-02 23:21:53.636956000 -0700
 @@ -58,6 +58,7 @@
  #include <linux/slab.h>
  #include <linux/kref.h>
@@ -10,11 +10,54 @@
  
  #include <asm/uaccess.h>
  
-@@ -1308,6 +1309,7 @@
+@@ -1284,6 +1285,8 @@
+ 	sc_put(sc);
+ }
+ 
++int lame_recovery_global = 0;
++
+ /* socket shutdown does a del_timer_sync against this as it tears down.
+  * we can't start this timer until we've got to the point in sc buildup
+  * where shutdown is going to be involved */
+@@ -1308,6 +1311,8 @@
  	     sc->sc_tv_func_start.tv_sec, sc->sc_tv_func_start.tv_usec,
  	     sc->sc_tv_func_stop.tv_sec, sc->sc_tv_func_stop.tv_usec);
  
-+	handle_sysrq('t', NULL, NULL);
++	if (lame_recovery_global)
++		handle_sysrq('t', NULL, NULL);
  	o2net_sc_queue_work(sc, &sc->sc_shutdown_work);
  }
  
+Index: cert2/fs/ocfs2/dlm/dlmrecovery.c
+===================================================================
+--- cert2.orig/fs/ocfs2/dlm/dlmrecovery.c	2006-04-02 23:16:18.944357000 -0700
++++ cert2/fs/ocfs2/dlm/dlmrecovery.c	2006-04-02 23:21:37.485233000 -0700
+@@ -53,6 +53,8 @@
+ #define MLOG_MASK_PREFIX (ML_DLM|ML_DLM_RECOVERY)
+ #include "cluster/masklog.h"
+ 
++extern int lame_recovery_global;
++
+ static void dlm_do_local_recovery_cleanup(struct dlm_ctxt *dlm, u8 dead_node);
+ 
+ static int dlm_recovery_thread(void *data);
+@@ -138,6 +140,7 @@
+ {
+ 	assert_spin_locked(&dlm->spinlock);
+ 	clear_bit(dlm->reco.dead_node, dlm->recovery_map);
++	lame_recovery_global--;
+ 	dlm_set_reco_dead_node(dlm, O2NM_INVALID_NODE_NUM);
+ 	dlm_set_reco_master(dlm, O2NM_INVALID_NODE_NUM);
+ }
+@@ -2287,8 +2290,10 @@
+ 	if (test_bit(idx, dlm->recovery_map))
+ 		mlog(0, "domain %s, node %u already added "
+ 		     "to recovery map!\n", dlm->name, idx);
+-	else
++	else {
+ 		set_bit(idx, dlm->recovery_map);
++		lame_recovery_global++;
++	}
+ }
+ 
+ void dlm_hb_node_down_cb(struct o2nm_node *node, int idx, void *data)

Modified: branches/ocfs2-1.2-cert/patches/series
===================================================================
--- branches/ocfs2-1.2-cert/patches/series	2006-04-03 03:21:22 UTC (rev 2809)
+++ branches/ocfs2-1.2-cert/patches/series	2006-04-03 06:27:12 UTC (rev 2810)
@@ -26,3 +26,4 @@
 remove-bad-spin-unlock.patch 
 continue-finalize-reco.patch
 fix-wait-in-mastery.patch
+lame-timeout-dbg.patch