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

[svn-commits@oss.oracle.com]

Author: khackel
Signed-off-by: jlbec
Date: 2006-04-04 00:52:59 -0500 (Tue, 04 Apr 2006)
New Revision: 2820

Modified:
   branches/ocfs2-1.2-cert/patches/hb-add_tracking_around_configured_nodes
   branches/ocfs2-1.2-cert/patches/move-dlm-work-to-thread.patch
Log:
add yield to move-dlm-work-to-thread.patch
Signed-off-by: jlbec

Modified: branches/ocfs2-1.2-cert/patches/hb-add_tracking_around_configured_nodes
===================================================================
--- branches/ocfs2-1.2-cert/patches/hb-add_tracking_around_configured_nodes	2006-04-04 02:27:13 UTC (rev 2819)
+++ branches/ocfs2-1.2-cert/patches/hb-add_tracking_around_configured_nodes	2006-04-04 05:52:59 UTC (rev 2820)
@@ -1,7 +1,7 @@
-Index: ocfs2-1.2-cert/fs/ocfs2/cluster/heartbeat.c
+Index: cert2/fs/ocfs2/cluster/heartbeat.c
 ===================================================================
---- ocfs2-1.2-cert.orig/fs/ocfs2/cluster/heartbeat.c	2006-04-03 19:19:37.188529000 -0700
-+++ ocfs2-1.2-cert/fs/ocfs2/cluster/heartbeat.c	2006-04-03 19:22:34.602441000 -0700
+--- cert2.orig/fs/ocfs2/cluster/heartbeat.c	2006-04-03 22:02:51.524979000 -0700
++++ cert2/fs/ocfs2/cluster/heartbeat.c	2006-04-03 22:46:04.733750000 -0700
 @@ -931,12 +931,14 @@
  	struct o2hb_bio_wait_ctxt write_wc;
  	struct timeval start;

Modified: branches/ocfs2-1.2-cert/patches/move-dlm-work-to-thread.patch
===================================================================
--- branches/ocfs2-1.2-cert/patches/move-dlm-work-to-thread.patch	2006-04-04 02:27:13 UTC (rev 2819)
+++ branches/ocfs2-1.2-cert/patches/move-dlm-work-to-thread.patch	2006-04-04 05:52:59 UTC (rev 2820)
@@ -1,7 +1,7 @@
-Index: ocfs2-1.2-cert/fs/ocfs2/dlm/dlmcommon.h
+Index: cert2/fs/ocfs2/dlm/dlmcommon.h
 ===================================================================
---- ocfs2-1.2-cert.orig/fs/ocfs2/dlm/dlmcommon.h	2006-04-03 15:25:32.979466000 -0700
-+++ ocfs2-1.2-cert/fs/ocfs2/dlm/dlmcommon.h	2006-04-03 15:27:05.546910000 -0700
+--- cert2.orig/fs/ocfs2/dlm/dlmcommon.h	2006-04-03 22:02:43.342537000 -0700
++++ cert2/fs/ocfs2/dlm/dlmcommon.h	2006-04-03 22:02:43.610537000 -0700
 @@ -121,12 +121,13 @@
  	struct o2hb_callback_func dlm_hb_down;
  	struct task_struct *dlm_thread_task;
@@ -28,10 +28,10 @@
  
  void dlm_get(struct dlm_ctxt *dlm);
  void dlm_put(struct dlm_ctxt *dlm);
-Index: ocfs2-1.2-cert/fs/ocfs2/dlm/dlmdomain.c
+Index: cert2/fs/ocfs2/dlm/dlmdomain.c
 ===================================================================
---- ocfs2-1.2-cert.orig/fs/ocfs2/dlm/dlmdomain.c	2006-04-03 15:26:50.143726000 -0700
-+++ ocfs2-1.2-cert/fs/ocfs2/dlm/dlmdomain.c	2006-04-03 15:27:05.560911000 -0700
+--- cert2.orig/fs/ocfs2/dlm/dlmdomain.c	2006-04-03 22:02:43.519537000 -0700
++++ cert2/fs/ocfs2/dlm/dlmdomain.c	2006-04-03 22:02:43.619537000 -0700
 @@ -290,6 +290,7 @@
  	dlm_unregister_domain_handlers(dlm);
  	dlm_complete_thread(dlm);
@@ -87,10 +87,10 @@
  
  	kref_init(&dlm->dlm_refs, dlm_ctxt_release);
  	dlm->dlm_state = DLM_CTXT_NEW;
-Index: ocfs2-1.2-cert/fs/ocfs2/dlm/dlmmaster.c
+Index: cert2/fs/ocfs2/dlm/dlmmaster.c
 ===================================================================
---- ocfs2-1.2-cert.orig/fs/ocfs2/dlm/dlmmaster.c	2006-04-03 15:26:50.182725000 -0700
-+++ ocfs2-1.2-cert/fs/ocfs2/dlm/dlmmaster.c	2006-04-03 15:27:05.580910000 -0700
+--- cert2.orig/fs/ocfs2/dlm/dlmmaster.c	2006-04-03 22:02:43.553538000 -0700
++++ cert2/fs/ocfs2/dlm/dlmmaster.c	2006-04-03 22:02:43.632537000 -0700
 @@ -2018,7 +2018,7 @@
  	list_add_tail(&item->list, &dlm->work_list);
  	spin_unlock(&dlm->work_lock);
@@ -100,10 +100,10 @@
  	return 0;
  }
  
-Index: ocfs2-1.2-cert/fs/ocfs2/dlm/dlmrecovery.c
+Index: cert2/fs/ocfs2/dlm/dlmrecovery.c
 ===================================================================
---- ocfs2-1.2-cert.orig/fs/ocfs2/dlm/dlmrecovery.c	2006-04-03 15:26:50.098725000 -0700
-+++ ocfs2-1.2-cert/fs/ocfs2/dlm/dlmrecovery.c	2006-04-03 15:27:05.601910000 -0700
+--- cert2.orig/fs/ocfs2/dlm/dlmrecovery.c	2006-04-03 22:02:43.503538000 -0700
++++ cert2/fs/ocfs2/dlm/dlmrecovery.c	2006-04-03 22:45:48.045977000 -0700
 @@ -149,6 +149,65 @@
  	spin_unlock(&dlm->spinlock);
  }
@@ -193,7 +193,7 @@
  
  		/* already have ref on dlm to avoid having
  		 * it disappear.  just double-check. */
-@@ -173,7 +239,10 @@
+@@ -173,10 +239,14 @@
  
  		/* this is allowed to sleep and
  		 * call network stuff */
@@ -204,7 +204,11 @@
  
  		dlm_put(dlm);
  		kfree(item);
-@@ -874,7 +943,7 @@
++		yield();
+ 	}
+ }
+ 
+@@ -874,7 +944,7 @@
  	spin_lock(&dlm->work_lock);
  	list_add_tail(&item->list, &dlm->work_list);
  	spin_unlock(&dlm->work_lock);
@@ -213,7 +217,7 @@
  
  	dlm_put(dlm);
  	return 0;
-@@ -1429,7 +1498,7 @@
+@@ -1429,7 +1499,7 @@
  	spin_lock(&dlm->work_lock);
  	list_add_tail(&item->list, &dlm->work_list);
  	spin_unlock(&dlm->work_lock);