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

[svn-commits@oss.oracle.com]

Author: smushran
Signed-off-by: khackel
Date: 2006-04-07 16:38:10 -0500 (Fri, 07 Apr 2006)
New Revision: 2832

Added:
   branches/ocfs2-1.2-cert/patches/dlm-fix_dlm_lock_reco_handling.patch
Modified:
   branches/ocfs2-1.2-cert/patches/series
Log:
patch dlm-fix_dlm_lock_reco_handling.patch added
Signed-off-by: khackel

Added: branches/ocfs2-1.2-cert/patches/dlm-fix_dlm_lock_reco_handling.patch
===================================================================
--- branches/ocfs2-1.2-cert/patches/dlm-fix_dlm_lock_reco_handling.patch	2006-04-07 20:54:34 UTC (rev 2831)
+++ branches/ocfs2-1.2-cert/patches/dlm-fix_dlm_lock_reco_handling.patch	2006-04-07 21:38:10 UTC (rev 2832)
@@ -0,0 +1,22 @@
+Index: ocfs2-1.2-cert/fs/ocfs2/dlm/dlmlock.c
+===================================================================
+--- ocfs2-1.2-cert.orig/fs/ocfs2/dlm/dlmlock.c	2006-04-07 14:21:05.466030000 -0700
++++ ocfs2-1.2-cert/fs/ocfs2/dlm/dlmlock.c	2006-04-07 14:23:03.473034000 -0700
+@@ -299,7 +299,7 @@ static enum dlm_status dlm_send_remote_l
+ 	if (tmpret >= 0) {
+ 		// successfully sent and received
+ 		ret = status;  // this is already a dlm_status
+-		if (ret == DLM_RECOVERING) {
++		if (ret == DLM_REJECTED) {
+ 			mlog(ML_ERROR, "%s:%.*s: BUG.  this is a stale lockres "
+ 			     "no longer owned by %u.  that node is coming back "
+ 			     "up currently.\n", dlm->name, create.namelen,
+@@ -457,7 +457,7 @@ int dlm_create_lock_handler(struct o2net
+ 
+ 	name = create->name;
+ 	namelen = create->namelen;
+-	status = DLM_RECOVERING;
++	status = DLM_REJECTED;
+ 	if (!dlm_domain_fully_joined(dlm)) {
+ 		mlog(ML_ERROR, "Domain %s not fully joined, but node %u is "
+ 		     "sending a create_lock message for lock %.*s!\n",

Modified: branches/ocfs2-1.2-cert/patches/series
===================================================================
--- branches/ocfs2-1.2-cert/patches/series	2006-04-07 20:54:34 UTC (rev 2831)
+++ branches/ocfs2-1.2-cert/patches/series	2006-04-07 21:38:10 UTC (rev 2832)
@@ -32,3 +32,4 @@
 jrnl-change_gfp_kernel_to_nofs 
 debug-bad-recovery.patch 
 dlm-new_proc_entry 
+dlm-fix_dlm_lock_reco_handling.patch