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

[svn-commits@oss.oracle.com]

Author: khackel
Signed-off-by: jlbec
Date: 2006-04-03 03:11:46 -0500 (Mon, 03 Apr 2006)
New Revision: 2813

Modified:
   branches/ocfs2-1.2-cert/patches/lame-timeout-dbg.patch
   branches/ocfs2-1.2-cert/patches/tune-down-msgs.patch
Log:
update tune-down-msgs and lame-timeout-dbg
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 08:00:04 UTC (rev 2812)
+++ branches/ocfs2-1.2-cert/patches/lame-timeout-dbg.patch	2006-04-03 08:11:46 UTC (rev 2813)
@@ -1,7 +1,7 @@
 Index: cert2/fs/ocfs2/cluster/tcp.c
 ===================================================================
 --- cert2.orig/fs/ocfs2/cluster/tcp.c	2006-04-03 00:53:05.670594000 -0700
-+++ cert2/fs/ocfs2/cluster/tcp.c	2006-04-03 00:55:29.521430000 -0700
++++ cert2/fs/ocfs2/cluster/tcp.c	2006-04-03 01:10:40.179280000 -0700
 @@ -58,6 +58,7 @@
  #include <linux/slab.h>
  #include <linux/kref.h>
@@ -10,7 +10,7 @@
  
  #include <asm/uaccess.h>
  
-@@ -1284,6 +1285,16 @@
+@@ -1284,6 +1285,18 @@
  	sc_put(sc);
  }
  
@@ -23,11 +23,13 @@
 +{
 +	lame_recovery_global--;
 +}
++EXPORT_SYMBOL_GPL(o2net_inc_lame_recovery_global);
++EXPORT_SYMBOL_GPL(o2net_dec_lame_recovery_global);
 +
  /* 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 +1319,8 @@
+@@ -1308,6 +1321,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);
  
@@ -39,7 +41,7 @@
 Index: cert2/fs/ocfs2/dlm/dlmrecovery.c
 ===================================================================
 --- cert2.orig/fs/ocfs2/dlm/dlmrecovery.c	2006-04-03 00:53:05.806594000 -0700
-+++ cert2/fs/ocfs2/dlm/dlmrecovery.c	2006-04-03 00:56:39.716900000 -0700
++++ cert2/fs/ocfs2/dlm/dlmrecovery.c	2006-04-03 01:09:36.748804000 -0700
 @@ -138,6 +138,7 @@
  {
  	assert_spin_locked(&dlm->spinlock);

Modified: branches/ocfs2-1.2-cert/patches/tune-down-msgs.patch
===================================================================
--- branches/ocfs2-1.2-cert/patches/tune-down-msgs.patch	2006-04-03 08:00:04 UTC (rev 2812)
+++ branches/ocfs2-1.2-cert/patches/tune-down-msgs.patch	2006-04-03 08:11:46 UTC (rev 2813)
@@ -1,7 +1,7 @@
 Index: cert2/fs/ocfs2/dlm/dlmlock.c
 ===================================================================
---- cert2.orig/fs/ocfs2/dlm/dlmlock.c	2006-04-03 00:53:09.753310000 -0700
-+++ cert2/fs/ocfs2/dlm/dlmlock.c	2006-04-03 00:56:52.804727000 -0700
+--- cert2.orig/fs/ocfs2/dlm/dlmlock.c	2006-04-03 01:09:36.733804000 -0700
++++ cert2/fs/ocfs2/dlm/dlmlock.c	2006-04-03 01:10:47.463013000 -0700
 @@ -232,7 +232,7 @@
  			/* recovery lock was mastered by dead node.
  			 * we need to have calc_usage shoot down this
@@ -13,8 +13,8 @@
  		} else if (status != DLM_NOTQUEUED) {
 Index: cert2/fs/ocfs2/dlm/dlmmaster.c
 ===================================================================
---- cert2.orig/fs/ocfs2/dlm/dlmmaster.c	2006-04-03 00:53:09.760313000 -0700
-+++ cert2/fs/ocfs2/dlm/dlmmaster.c	2006-04-03 00:56:52.818727000 -0700
+--- cert2.orig/fs/ocfs2/dlm/dlmmaster.c	2006-04-03 01:09:36.740806000 -0700
++++ cert2/fs/ocfs2/dlm/dlmmaster.c	2006-04-03 01:10:47.477013000 -0700
 @@ -834,7 +834,7 @@
  		 * but they might own this lockres.  wait on them. */
  		bit = find_next_bit(dlm->recovery_map, O2NM_MAX_NODES, 0);
@@ -223,8 +223,8 @@
  		/* if there is a lockres associated with this
 Index: cert2/fs/ocfs2/dlm/dlmrecovery.c
 ===================================================================
---- cert2.orig/fs/ocfs2/dlm/dlmrecovery.c	2006-04-03 00:56:39.716900000 -0700
-+++ cert2/fs/ocfs2/dlm/dlmrecovery.c	2006-04-03 00:56:52.831727000 -0700
+--- cert2.orig/fs/ocfs2/dlm/dlmrecovery.c	2006-04-03 01:09:36.748804000 -0700
++++ cert2/fs/ocfs2/dlm/dlmrecovery.c	2006-04-03 01:10:47.490013000 -0700
 @@ -120,7 +120,7 @@
  {
  	assert_spin_locked(&dlm->spinlock);