[Ocfs2-commits] smushran commits r2830 - branches/ocfs2-1.2-cert/patches

[svn-commits@oss.oracle.com]

Author: smushran
Signed-off-by: khackel
Date: 2006-04-06 21:07:55 -0500 (Thu, 06 Apr 2006)
New Revision: 2830

Modified:
   branches/ocfs2-1.2-cert/patches/debug-bad-recovery.patch
Log:
patch debug-bad-recovery.patch updated
Signed-off-by: khackel

Modified: branches/ocfs2-1.2-cert/patches/debug-bad-recovery.patch
===================================================================
--- branches/ocfs2-1.2-cert/patches/debug-bad-recovery.patch	2006-04-06 22:04:25 UTC (rev 2829)
+++ branches/ocfs2-1.2-cert/patches/debug-bad-recovery.patch	2006-04-07 02:07:55 UTC (rev 2830)
@@ -1,8 +1,8 @@
-Index: cert2/fs/ocfs2/dlm/dlmconvert.c
+Index: ocfs2-1.2-cert/fs/ocfs2/dlm/dlmconvert.c
 ===================================================================
---- cert2.orig/fs/ocfs2/dlm/dlmconvert.c	2006-04-06 10:57:56.559041000 -0700
-+++ cert2/fs/ocfs2/dlm/dlmconvert.c	2006-04-06 11:02:17.272259000 -0700
-@@ -467,6 +467,12 @@
+--- ocfs2-1.2-cert.orig/fs/ocfs2/dlm/dlmconvert.c	2006-04-06 15:04:31.516055000 -0700
++++ ocfs2-1.2-cert/fs/ocfs2/dlm/dlmconvert.c	2006-04-06 17:44:33.459840000 -0700
+@@ -467,6 +467,12 @@ int dlm_convert_lock_handler(struct o2ne
  	}
  
  	spin_lock(&res->spinlock);
@@ -15,7 +15,7 @@
  	list_for_each(iter, &res->granted) {
  		lock = list_entry(iter, struct dlm_lock, list);
  		if (lock->ml.cookie == cnv->cookie &&
-@@ -476,6 +482,20 @@
+@@ -476,6 +482,20 @@ int dlm_convert_lock_handler(struct o2ne
  		}
  		lock = NULL;
  	}
@@ -28,7 +28,7 @@
 +				     "for node %u, lock->ml.cookie=%llu, "
 +				     "cnv->cookie=%llu\n", cnv->node_idx,
 +				     lock->ml.cookie, cnv->cookie);
-+
++				break;
 +			}
 +		}
 +		lock = NULL;
@@ -36,11 +36,11 @@
  	spin_unlock(&res->spinlock);
  	if (!lock) {
  		status = DLM_IVLOCKID;
-Index: cert2/fs/ocfs2/dlm/dlmrecovery.c
+Index: ocfs2-1.2-cert/fs/ocfs2/dlm/dlmrecovery.c
 ===================================================================
---- cert2.orig/fs/ocfs2/dlm/dlmrecovery.c	2006-04-06 11:00:52.775544000 -0700
-+++ cert2/fs/ocfs2/dlm/dlmrecovery.c	2006-04-06 11:02:17.298259000 -0700
-@@ -485,7 +485,7 @@
+--- ocfs2-1.2-cert.orig/fs/ocfs2/dlm/dlmrecovery.c	2006-04-06 15:04:37.799059000 -0700
++++ ocfs2-1.2-cert/fs/ocfs2/dlm/dlmrecovery.c	2006-04-06 15:04:38.613808000 -0700
+@@ -485,7 +485,7 @@ void dlm_wait_for_recovery(struct dlm_ct
  		     dlm->reco.dead_node);
  		//dlm_print_reco_junk(dlm);
  	}
@@ -49,7 +49,7 @@
  	while (1) {
  		if (wait_event_timeout(dlm->reco.event, 
  				       !dlm_in_recovery(dlm), 
-@@ -498,7 +498,8 @@
+@@ -498,7 +498,8 @@ void dlm_wait_for_recovery(struct dlm_ct
  		     dlm->reco.dead_node);
  		//dlm_print_reco_junk(dlm);
  	}
@@ -59,7 +59,7 @@
  }
  
  static void dlm_begin_recovery(struct dlm_ctxt *dlm)
-@@ -749,12 +750,11 @@
+@@ -749,12 +750,11 @@ static int dlm_remaster_locks(struct dlm
  					break;
  				case DLM_RECO_NODE_DATA_RECEIVING:
  				case DLM_RECO_NODE_DATA_REQUESTED:
@@ -76,11 +76,11 @@
  					mlog(mlg, "%s: node %u still in state %s\n",
  					     dlm->name, ndata->node_num,
  					     ndata->state==DLM_RECO_NODE_DATA_RECEIVING ?
-Index: cert2/fs/ocfs2/dlm/dlmmaster.c
+Index: ocfs2-1.2-cert/fs/ocfs2/dlm/dlmmaster.c
 ===================================================================
---- cert2.orig/fs/ocfs2/dlm/dlmmaster.c	2006-04-06 10:57:56.705021000 -0700
-+++ cert2/fs/ocfs2/dlm/dlmmaster.c	2006-04-06 11:02:17.314259000 -0700
-@@ -1694,13 +1694,13 @@
+--- ocfs2-1.2-cert.orig/fs/ocfs2/dlm/dlmmaster.c	2006-04-06 15:04:37.778080000 -0700
++++ ocfs2-1.2-cert/fs/ocfs2/dlm/dlmmaster.c	2006-04-06 15:04:38.633808000 -0700
+@@ -1694,13 +1694,13 @@ again:
  		tmpret = o2net_send_message(DLM_ASSERT_MASTER_MSG, dlm->key,
  					    &assert, sizeof(assert), to, &r);
  		if (tmpret < 0) {
@@ -97,7 +97,7 @@
  			/* any nonzero status return will do */
  			ret = tmpret;
  		} else if (r < 0) {
-@@ -2086,7 +2086,8 @@
+@@ -2086,7 +2086,8 @@ void dlm_assert_master_worker(struct dlm
  				   nodemap, flags);
  	if (ret < 0) {
  		/* no need to restart, we are done */
@@ -107,7 +107,7 @@
  	}
  
  	/* Ok, we've asserted ourselves.  Let's let migration start. */
-@@ -2861,7 +2862,7 @@
+@@ -2861,7 +2862,7 @@ top:
  				 * may result in the mle being unlinked and
  				 * freed, but there may still be a process
  				 * waiting in the dlmlock path which is fine. */