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

[svn-commits@oss.oracle.com]

Author: khackel
Signed-off-by: zab
Date: 2006-04-04 15:07:50 -0500 (Tue, 04 Apr 2006)
New Revision: 2821

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:
change yield to cond_resched
Signed-off-by: zab

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 05:52:59 UTC (rev 2820)
+++ branches/ocfs2-1.2-cert/patches/hb-add_tracking_around_configured_nodes	2006-04-04 20:07:50 UTC (rev 2821)
@@ -1,7 +1,7 @@
 Index: cert2/fs/ocfs2/cluster/heartbeat.c
 ===================================================================
---- 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
+--- cert2.orig/fs/ocfs2/cluster/heartbeat.c	2006-04-04 13:03:31.011691000 -0700
++++ cert2/fs/ocfs2/cluster/heartbeat.c	2006-04-04 13:06:14.702310000 -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 05:52:59 UTC (rev 2820)
+++ branches/ocfs2-1.2-cert/patches/move-dlm-work-to-thread.patch	2006-04-04 20:07:50 UTC (rev 2821)
@@ -1,7 +1,7 @@
 Index: cert2/fs/ocfs2/dlm/dlmcommon.h
 ===================================================================
---- 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
+--- cert2.orig/fs/ocfs2/dlm/dlmcommon.h	2006-04-04 13:03:23.871937000 -0700
++++ cert2/fs/ocfs2/dlm/dlmcommon.h	2006-04-04 13:03:24.112937000 -0700
 @@ -121,12 +121,13 @@
  	struct o2hb_callback_func dlm_hb_down;
  	struct task_struct *dlm_thread_task;
@@ -30,8 +30,8 @@
  void dlm_put(struct dlm_ctxt *dlm);
 Index: cert2/fs/ocfs2/dlm/dlmdomain.c
 ===================================================================
---- 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
+--- cert2.orig/fs/ocfs2/dlm/dlmdomain.c	2006-04-04 13:03:23.982938000 -0700
++++ cert2/fs/ocfs2/dlm/dlmdomain.c	2006-04-04 13:03:24.123937000 -0700
 @@ -290,6 +290,7 @@
  	dlm_unregister_domain_handlers(dlm);
  	dlm_complete_thread(dlm);
@@ -89,8 +89,8 @@
  	dlm->dlm_state = DLM_CTXT_NEW;
 Index: cert2/fs/ocfs2/dlm/dlmmaster.c
 ===================================================================
---- 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
+--- cert2.orig/fs/ocfs2/dlm/dlmmaster.c	2006-04-04 13:03:24.037937000 -0700
++++ cert2/fs/ocfs2/dlm/dlmmaster.c	2006-04-04 13:03:24.140937000 -0700
 @@ -2018,7 +2018,7 @@
  	list_add_tail(&item->list, &dlm->work_list);
  	spin_unlock(&dlm->work_lock);
@@ -102,8 +102,8 @@
  
 Index: cert2/fs/ocfs2/dlm/dlmrecovery.c
 ===================================================================
---- 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
+--- cert2.orig/fs/ocfs2/dlm/dlmrecovery.c	2006-04-04 13:03:23.962937000 -0700
++++ cert2/fs/ocfs2/dlm/dlmrecovery.c	2006-04-04 13:03:59.721534000 -0700
 @@ -149,6 +149,65 @@
  	spin_unlock(&dlm->spinlock);
  }
@@ -204,7 +204,7 @@
  
  		dlm_put(dlm);
  		kfree(item);
-+		yield();
++		cond_resched();
  	}
  }
  
@@ -226,3 +226,16 @@
  
  leave:
  	dlm_put(dlm);
+Index: cert2/fs/ocfs2/dlm/dlmthread.c
+===================================================================
+--- cert2.orig/fs/ocfs2/dlm/dlmthread.c	2006-04-04 13:03:23.250258000 -0700
++++ cert2/fs/ocfs2/dlm/dlmthread.c	2006-04-04 13:05:55.440466000 -0700
+@@ -750,7 +750,7 @@
+ 
+ 		/* yield and continue right away if there is more work to do */
+ 		if (!n) {
+-			yield();
++			cond_resched();
+ 			continue;
+ 		}
+