[Ocfs2-commits] smushran commits r2817 - branches/ocfs2-1.2-cert/patches
svn-commits@oss.oracle.com
svn-commits at oss.oracle.com
Mon Apr 3 17:29:51 CDT 2006
Author: smushran
Signed-off-by: khackel
Date: 2006-04-03 17:29:50 -0500 (Mon, 03 Apr 2006)
New Revision: 2817
Modified:
branches/ocfs2-1.2-cert/patches/dlm-replace_gfp_kernel_with_nofs
branches/ocfs2-1.2-cert/patches/move-dlm-work-to-thread.patch
branches/ocfs2-1.2-cert/patches/series
Log:
removed lame-timeout-dbg.patch
Signed-off-by: khackel
Modified: branches/ocfs2-1.2-cert/patches/dlm-replace_gfp_kernel_with_nofs
===================================================================
--- branches/ocfs2-1.2-cert/patches/dlm-replace_gfp_kernel_with_nofs 2006-04-03 21:13:21 UTC (rev 2816)
+++ branches/ocfs2-1.2-cert/patches/dlm-replace_gfp_kernel_with_nofs 2006-04-03 22:29:50 UTC (rev 2817)
@@ -1,8 +1,8 @@
Index: ocfs2-1.2-cert/fs/ocfs2/dlm/dlmrecovery.c
===================================================================
---- ocfs2-1.2-cert.orig/fs/ocfs2/dlm/dlmrecovery.c 2006-04-03 12:11:38.068749000 -0700
-+++ ocfs2-1.2-cert/fs/ocfs2/dlm/dlmrecovery.c 2006-04-03 12:11:38.291709000 -0700
-@@ -769,7 +769,7 @@
+--- ocfs2-1.2-cert.orig/fs/ocfs2/dlm/dlmrecovery.c 2006-04-03 15:25:33.033442000 -0700
++++ ocfs2-1.2-cert/fs/ocfs2/dlm/dlmrecovery.c 2006-04-03 15:26:50.098725000 -0700
+@@ -768,7 +768,7 @@
}
BUG_ON(num == dead_node);
@@ -11,7 +11,7 @@
if (!ndata) {
dlm_destroy_recovery_area(dlm, dead_node);
return -ENOMEM;
-@@ -853,14 +853,14 @@
+@@ -852,14 +852,14 @@
}
BUG_ON(lr->dead_node != dlm->reco.dead_node);
@@ -28,7 +28,7 @@
if (!buf) {
kfree(item);
dlm_put(dlm);
-@@ -1338,8 +1338,8 @@
+@@ -1337,8 +1337,8 @@
mlog(0, "all done flag. all lockres data received!\n");
ret = -ENOMEM;
@@ -42,7 +42,7 @@
Index: ocfs2-1.2-cert/fs/ocfs2/dlm/dlmdebug.c
===================================================================
--- ocfs2-1.2-cert.orig/fs/ocfs2/dlm/dlmdebug.c 2006-03-27 14:36:39.586328000 -0800
-+++ ocfs2-1.2-cert/fs/ocfs2/dlm/dlmdebug.c 2006-04-03 12:11:38.299709000 -0700
++++ ocfs2-1.2-cert/fs/ocfs2/dlm/dlmdebug.c 2006-04-03 15:26:50.106725000 -0700
@@ -177,7 +177,7 @@
mlog(ML_ERROR, "user passed too little data: %d bytes\n", len);
goto leave;
@@ -63,8 +63,8 @@
ret = -ENOMEM;
Index: ocfs2-1.2-cert/fs/ocfs2/dlm/dlmdomain.c
===================================================================
---- ocfs2-1.2-cert.orig/fs/ocfs2/dlm/dlmdomain.c 2006-04-03 12:11:37.287030000 -0700
-+++ ocfs2-1.2-cert/fs/ocfs2/dlm/dlmdomain.c 2006-04-03 12:18:30.499458000 -0700
+--- ocfs2-1.2-cert.orig/fs/ocfs2/dlm/dlmdomain.c 2006-04-03 15:25:32.155764000 -0700
++++ ocfs2-1.2-cert/fs/ocfs2/dlm/dlmdomain.c 2006-04-03 15:26:50.143726000 -0700
@@ -892,7 +892,7 @@
mlog_entry("%p", dlm);
@@ -102,7 +102,7 @@
Index: ocfs2-1.2-cert/fs/ocfs2/dlm/dlmfs.c
===================================================================
--- ocfs2-1.2-cert.orig/fs/ocfs2/dlm/dlmfs.c 2006-03-27 14:36:39.384360000 -0800
-+++ ocfs2-1.2-cert/fs/ocfs2/dlm/dlmfs.c 2006-04-03 12:11:38.318709000 -0700
++++ ocfs2-1.2-cert/fs/ocfs2/dlm/dlmfs.c 2006-04-03 15:26:50.151725000 -0700
@@ -116,7 +116,7 @@
* doesn't make sense for LVB writes. */
file->f_flags &= ~O_APPEND;
@@ -132,8 +132,8 @@
Index: ocfs2-1.2-cert/fs/ocfs2/dlm/dlmlock.c
===================================================================
---- ocfs2-1.2-cert.orig/fs/ocfs2/dlm/dlmlock.c 2006-04-03 12:11:36.702351000 -0700
-+++ ocfs2-1.2-cert/fs/ocfs2/dlm/dlmlock.c 2006-04-03 12:11:38.332709000 -0700
+--- ocfs2-1.2-cert.orig/fs/ocfs2/dlm/dlmlock.c 2006-04-03 15:25:31.354084000 -0700
++++ ocfs2-1.2-cert/fs/ocfs2/dlm/dlmlock.c 2006-04-03 15:26:50.160725000 -0700
@@ -408,13 +408,13 @@
struct dlm_lock *lock;
int kernel_allocated = 0;
@@ -152,8 +152,8 @@
return NULL;
Index: ocfs2-1.2-cert/fs/ocfs2/dlm/dlmmaster.c
===================================================================
---- ocfs2-1.2-cert.orig/fs/ocfs2/dlm/dlmmaster.c 2006-04-03 12:11:37.861956000 -0700
-+++ ocfs2-1.2-cert/fs/ocfs2/dlm/dlmmaster.c 2006-04-03 12:11:38.354709000 -0700
+--- ocfs2-1.2-cert.orig/fs/ocfs2/dlm/dlmmaster.c 2006-04-03 15:25:33.006442000 -0700
++++ ocfs2-1.2-cert/fs/ocfs2/dlm/dlmmaster.c 2006-04-03 15:26:50.182725000 -0700
@@ -699,11 +699,11 @@
{
struct dlm_lock_resource *res;
@@ -224,7 +224,7 @@
Index: ocfs2-1.2-cert/fs/ocfs2/dlm/userdlm.c
===================================================================
--- ocfs2-1.2-cert.orig/fs/ocfs2/dlm/userdlm.c 2006-03-31 14:11:14.075366000 -0800
-+++ ocfs2-1.2-cert/fs/ocfs2/dlm/userdlm.c 2006-04-03 12:11:38.380709000 -0700
++++ ocfs2-1.2-cert/fs/ocfs2/dlm/userdlm.c 2006-04-03 15:26:50.191725000 -0700
@@ -672,7 +672,7 @@
u32 dlm_key;
char *domain;
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-03 21:13:21 UTC (rev 2816)
+++ branches/ocfs2-1.2-cert/patches/move-dlm-work-to-thread.patch 2006-04-03 22:29:50 UTC (rev 2817)
@@ -1,7 +1,7 @@
-Index: cert2/fs/ocfs2/dlm/dlmcommon.h
+Index: ocfs2-1.2-cert/fs/ocfs2/dlm/dlmcommon.h
===================================================================
---- cert2.orig/fs/ocfs2/dlm/dlmcommon.h 2006-04-03 13:05:22.485447000 -0700
-+++ cert2/fs/ocfs2/dlm/dlmcommon.h 2006-04-03 13:59:43.391426000 -0700
+--- ocfs2-1.2-cert.orig/fs/ocfs2/dlm/dlmcommon.h 2006-04-03 15:25:32.979466000 -0700
++++ ocfs2-1.2-cert/fs/ocfs2/dlm/dlmcommon.h 2006-04-03 15:27:05.546910000 -0700
@@ -121,12 +121,13 @@
struct o2hb_callback_func dlm_hb_down;
struct task_struct *dlm_thread_task;
@@ -28,10 +28,10 @@
void dlm_get(struct dlm_ctxt *dlm);
void dlm_put(struct dlm_ctxt *dlm);
-Index: cert2/fs/ocfs2/dlm/dlmdomain.c
+Index: ocfs2-1.2-cert/fs/ocfs2/dlm/dlmdomain.c
===================================================================
---- cert2.orig/fs/ocfs2/dlm/dlmdomain.c 2006-04-03 13:05:22.678447000 -0700
-+++ cert2/fs/ocfs2/dlm/dlmdomain.c 2006-04-03 13:59:53.091420000 -0700
+--- ocfs2-1.2-cert.orig/fs/ocfs2/dlm/dlmdomain.c 2006-04-03 15:26:50.143726000 -0700
++++ ocfs2-1.2-cert/fs/ocfs2/dlm/dlmdomain.c 2006-04-03 15:27:05.560911000 -0700
@@ -290,6 +290,7 @@
dlm_unregister_domain_handlers(dlm);
dlm_complete_thread(dlm);
@@ -87,10 +87,10 @@
kref_init(&dlm->dlm_refs, dlm_ctxt_release);
dlm->dlm_state = DLM_CTXT_NEW;
-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-03 13:05:22.720447000 -0700
-+++ cert2/fs/ocfs2/dlm/dlmmaster.c 2006-04-03 13:54:09.433523000 -0700
+--- ocfs2-1.2-cert.orig/fs/ocfs2/dlm/dlmmaster.c 2006-04-03 15:26:50.182725000 -0700
++++ ocfs2-1.2-cert/fs/ocfs2/dlm/dlmmaster.c 2006-04-03 15:27:05.580910000 -0700
@@ -2018,7 +2018,7 @@
list_add_tail(&item->list, &dlm->work_list);
spin_unlock(&dlm->work_lock);
@@ -100,11 +100,11 @@
return 0;
}
-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-03 13:05:22.658447000 -0700
-+++ cert2/fs/ocfs2/dlm/dlmrecovery.c 2006-04-03 14:00:58.817233000 -0700
-@@ -150,6 +150,65 @@
+--- ocfs2-1.2-cert.orig/fs/ocfs2/dlm/dlmrecovery.c 2006-04-03 15:26:50.098725000 -0700
++++ ocfs2-1.2-cert/fs/ocfs2/dlm/dlmrecovery.c 2006-04-03 15:27:05.601910000 -0700
+@@ -149,6 +149,65 @@
spin_unlock(&dlm->spinlock);
}
@@ -170,7 +170,7 @@
/* Worker function used during recovery. */
void dlm_dispatch_work(void *data)
{
-@@ -158,15 +217,22 @@
+@@ -157,15 +216,22 @@
struct list_head *iter, *iter2;
struct dlm_work_item *item;
dlm_workfunc_t *workfunc;
@@ -193,7 +193,7 @@
/* already have ref on dlm to avoid having
* it disappear. just double-check. */
-@@ -174,7 +240,10 @@
+@@ -173,7 +239,10 @@
/* this is allowed to sleep and
* call network stuff */
@@ -204,7 +204,7 @@
dlm_put(dlm);
kfree(item);
-@@ -875,7 +944,7 @@
+@@ -874,7 +943,7 @@
spin_lock(&dlm->work_lock);
list_add_tail(&item->list, &dlm->work_list);
spin_unlock(&dlm->work_lock);
@@ -213,7 +213,7 @@
dlm_put(dlm);
return 0;
-@@ -1430,7 +1499,7 @@
+@@ -1429,7 +1498,7 @@
spin_lock(&dlm->work_lock);
list_add_tail(&item->list, &dlm->work_list);
spin_unlock(&dlm->work_lock);
Modified: branches/ocfs2-1.2-cert/patches/series
===================================================================
--- branches/ocfs2-1.2-cert/patches/series 2006-04-03 21:13:21 UTC (rev 2816)
+++ branches/ocfs2-1.2-cert/patches/series 2006-04-03 22:29:50 UTC (rev 2817)
@@ -26,7 +26,6 @@
remove-bad-spin-unlock.patch
continue-finalize-reco.patch
fix-wait-in-mastery.patch
-lame-timeout-dbg.patch
dlm-replace_gfp_kernel_with_nofs
hb-replace_gfp_kernel_with_nofs
-move-dlm-work-to-thread.patch
+move-dlm-work-to-thread.patch
More information about the Ocfs2-commits
mailing list