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

[svn-commits@oss.oracle.com]

Author: khackel
Signed-off-by: jlbec
Date: 2006-04-05 22:53:30 -0500 (Wed, 05 Apr 2006)
New Revision: 2825

Modified:
   branches/ocfs2-1.2-cert/patches/debug-bad-recovery.patch
Log:
make dlmconvert_remote wait on recovery
Signed-off-by: jlbec

Modified: branches/ocfs2-1.2-cert/patches/debug-bad-recovery.patch
===================================================================
--- branches/ocfs2-1.2-cert/patches/debug-bad-recovery.patch	2006-04-06 01:15:28 UTC (rev 2824)
+++ branches/ocfs2-1.2-cert/patches/debug-bad-recovery.patch	2006-04-06 03:53:30 UTC (rev 2825)
@@ -1,8 +1,21 @@
-Index: ocfs2-1.2-cert/fs/ocfs2/dlm/dlmconvert.c
+Index: cert2/fs/ocfs2/dlm/dlmconvert.c
 ===================================================================
---- ocfs2-1.2-cert.orig/fs/ocfs2/dlm/dlmconvert.c	2006-04-05 16:45:24.763257000 -0700
-+++ ocfs2-1.2-cert/fs/ocfs2/dlm/dlmconvert.c	2006-04-05 18:10:12.684263000 -0700
-@@ -476,6 +476,20 @@ int dlm_convert_lock_handler(struct o2ne
+--- cert2.orig/fs/ocfs2/dlm/dlmconvert.c	2006-04-05 20:42:53.211199000 -0700
++++ cert2/fs/ocfs2/dlm/dlmconvert.c	2006-04-05 20:50:14.257882000 -0700
+@@ -467,6 +467,12 @@
+ 	}
+ 
+ 	spin_lock(&res->spinlock);
++	status = __dlm_lockres_state_to_status(res);
++	if (status != DLM_NORMAL) {
++		spin_unlock(&res->spinlock);
++		dlm_error(status);
++		goto leave;
++	}
+ 	list_for_each(iter, &res->granted) {
+ 		lock = list_entry(iter, struct dlm_lock, list);
+ 		if (lock->ml.cookie == cnv->cookie &&
+@@ -476,6 +482,20 @@
  		}
  		lock = NULL;
  	}
@@ -23,11 +36,11 @@
  	spin_unlock(&res->spinlock);
  	if (!lock) {
  		status = DLM_IVLOCKID;
-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-05 16:45:29.931652000 -0700
-+++ ocfs2-1.2-cert/fs/ocfs2/dlm/dlmrecovery.c	2006-04-05 16:45:30.603331000 -0700
-@@ -488,7 +488,7 @@ void dlm_wait_for_recovery(struct dlm_ct
+--- cert2.orig/fs/ocfs2/dlm/dlmrecovery.c	2006-04-05 20:42:54.816878000 -0700
++++ cert2/fs/ocfs2/dlm/dlmrecovery.c	2006-04-05 20:42:55.061699000 -0700
+@@ -488,7 +488,7 @@
  		     dlm->reco.dead_node);
  		//dlm_print_reco_junk(dlm);
  	}
@@ -36,7 +49,7 @@
  	while (1) {
  		if (wait_event_timeout(dlm->reco.event, 
  				       !dlm_in_recovery(dlm), 
-@@ -501,7 +501,8 @@ void dlm_wait_for_recovery(struct dlm_ct
+@@ -501,7 +501,8 @@
  		     dlm->reco.dead_node);
  		//dlm_print_reco_junk(dlm);
  	}