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

[svn-commits@oss.oracle.com]

Author: smushran
Signed-off-by: khackel
Date: 2006-04-05 20:15:28 -0500 (Wed, 05 Apr 2006)
New Revision: 2824

Modified:
   branches/ocfs2-1.2-cert/patches/debug-bad-recovery.patch
   branches/ocfs2-1.2-cert/patches/series
Log:
patch debug-bad-recovery.patch fixed
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-05 22:29:03 UTC (rev 2823)
+++ branches/ocfs2-1.2-cert/patches/debug-bad-recovery.patch	2006-04-06 01:15:28 UTC (rev 2824)
@@ -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-05 14:47:56.219381000 -0700
-+++ cert2/fs/ocfs2/dlm/dlmconvert.c	2006-04-05 15:18:32.987025000 -0700
-@@ -476,6 +476,19 @@
+--- 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
  		}
  		lock = NULL;
  	}
@@ -18,15 +18,16 @@
 +
 +			}
 +		}
++		lock = NULL;
 +	}
  	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-05 15:15:05.616701000 -0700
-+++ cert2/fs/ocfs2/dlm/dlmrecovery.c	2006-04-05 15:18:54.703262000 -0700
-@@ -488,7 +488,7 @@
+--- 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
  		     dlm->reco.dead_node);
  		//dlm_print_reco_junk(dlm);
  	}
@@ -35,7 +36,7 @@
  	while (1) {
  		if (wait_event_timeout(dlm->reco.event, 
  				       !dlm_in_recovery(dlm), 
-@@ -501,7 +501,8 @@
+@@ -501,7 +501,8 @@ void dlm_wait_for_recovery(struct dlm_ct
  		     dlm->reco.dead_node);
  		//dlm_print_reco_junk(dlm);
  	}

Modified: branches/ocfs2-1.2-cert/patches/series
===================================================================
--- branches/ocfs2-1.2-cert/patches/series	2006-04-05 22:29:03 UTC (rev 2823)
+++ branches/ocfs2-1.2-cert/patches/series	2006-04-06 01:15:28 UTC (rev 2824)
@@ -30,4 +30,4 @@
 move-dlm-work-to-thread.patch 
 hb-add_tracking_around_configured_nodes 
 jrnl-change_gfp_kernel_to_nofs 
-debug-bad-recovery.patch
+debug-bad-recovery.patch