search for: dlmcommon

I've read fs/ocfs2/dlm/dlmcommon.h to study the structure of dlm_migratable_lockres. However, I may find a typo for the DLM_MIG_LOCKRES_MAX_LEN, the NET_MAX_PAYLOAD_BYTES should be O2NET_MAX_PAYLOAD_BYTES, I think. In comments, the sizeof(net_msg) should be sizeof(o2net_msg) by referring to fs/ocfs2/cluster/tcp.h. Signed-off-by:...

These patches convert the mle list to a hash. The same patches apply on ocfs2 1.4 too. Currently, we use the same number of hash pages for mles and lockres'. This will be addressed in a future patch that will make both of them configurable. Sunil

...new parameter "struct dlm_lock_resource *res" is added to dlm_new_lock() so that we can know if we need to allocate lvb for the dlm_lock. And we have to make the lockres availale for calling dlm_new_lock(). Signed-off-by: Wengang Wang <wen.gang.wang at oracle.com> --- fs/ocfs2/dlm/dlmcommon.h | 3 +- fs/ocfs2/dlm/dlmlock.c | 55 ++++++++++++++++++++++--------------------- fs/ocfs2/dlm/dlmrecovery.c | 2 +- 3 files changed, 31 insertions(+), 29 deletions(-) diff --git a/fs/ocfs2/dlm/dlmcommon.h b/fs/ocfs2/dlm/dlmcommon.h index 49e6492..4e10aa6 100644 --- a/fs/ocfs2/dlm/d...

The changes from the last drop are: 1. Patch 11 removes struct dlm_lock_name. 2. Patch 12 is an unrelated bugfix. Actually is related to a bugfix that we are retracting in mainline currently. The patch may need more testing. While I did hit the condition in my testing, Marcos hasn't. I am sending it because it can be queued for 2.6.30. Give us more time to test. 3. Patch 13 will be useful

...); @@ -1366,7 +1395,7 @@ static struct dlm_ctxt *dlm_alloc_ctxt(c } for (i=0; i<DLM_HASH_BUCKETS; i++) - INIT_HLIST_HEAD(&dlm->lockres_hash[i]); + INIT_HLIST_HEAD(dlm_lockres_hash(dlm, i)); strcpy(dlm->name, domain); dlm->key = key; diff -up ./svnocfs2-1.2/fs/ocfs2/dlm/dlmcommon.h.orig ./svnocfs2-1.2/fs/ocfs2/dlm/dlmcommon.h --- ./svnocfs2-1.2/fs/ocfs2/dlm/dlmcommon.h.orig 2009-04-22 10:59:51.000000000 +0800 +++ ./svnocfs2-1.2/fs/ocfs2/dlm/dlmcommon.h 2009-04-22 11:26:06.000000000 +0800 @@ -37,7 +37,14 @@ #define DLM_THREAD_SHUFFLE_INTERVAL 5 // flush everything ev...

Please review the list of patches being applied to the ocfs2 1.4 tree. All patches list the mainline commit hash. Thanks Sunil

allocates at least one page. mainline git commit: c8f33b6e86af74ee7b800f57cac7b3c8559318fe Authored-by: Joel Becker <joel.becker at oracle.com> Signed-off-by: Wengang Wang <wen.gang.wang at oracle.com> -- Index: ocfs2-1.2/fs/ocfs2/dlm/dlmcommon.h =================================================================== --- ocfs2-1.2/fs/ocfs2/dlm/dlmcommon.h (revision 2) +++ ocfs2-1.2/fs/ocfs2/dlm/dlmcommon.h (revision 3) @@ -37,8 +37,12 @@ #define DLM_THREAD_SHUFFLE_INTERVAL 5 // flush everything every 5 passes #define DLM_THREAD_MS...

enlarge hash table. mainline git commit: ffae48e79e56fe63589049a0bf3512bcbf7a4327 Authored-by: Jan Kara <jack at suse.cz> Signed-off-by: Wengang Wang <wen.gang.wang at oracle.com> -- Index: ocfs2-1.2/fs/ocfs2/dlm/dlmcommon.h =================================================================== --- ocfs2-1.2/fs/ocfs2/dlm/dlmcommon.h (revision 3) +++ ocfs2-1.2/fs/ocfs2/dlm/dlmcommon.h (revision 4) @@ -37,7 +37,7 @@ #define DLM_THREAD_SHUFFLE_INTERVAL 5 // flush everything every 5 passes #define DLM_THREAD_MS...

...struct dlm_ spin_lock(&dlm->spinlock); for (i=0; i<DLM_HASH_BUCKETS; i++) { - bucket = &(dlm->lockres_hash[i]); + bucket = dlm_lockres_hash(dlm, i); hlist_for_each_entry(res, iter, bucket, hash_node) dlm_print_one_lock_resource(res); } Index: ocfs2-1.2/fs/ocfs2/dlm/dlmcommon.h =================================================================== --- ocfs2-1.2/fs/ocfs2/dlm/dlmcommon.h (revision 1) +++ ocfs2-1.2/fs/ocfs2/dlm/dlmcommon.h (revision 2) @@ -37,7 +37,10 @@ #define DLM_THREAD_SHUFFLE_INTERVAL 5 // flush everything every 5 passes #define DLM_THREAD_MS...

...cfs2/aops.c | 23 +- fs/ocfs2/cluster/heartbeat.c | 96 ++- fs/ocfs2/cluster/heartbeat.h | 3 +- fs/ocfs2/cluster/nodemanager.c | 9 +- fs/ocfs2/dir.c | 2806 ++++++++++++++++++++++++++++++++++++++-- fs/ocfs2/dir.h | 57 +- fs/ocfs2/dlm/dlmcommon.h | 58 +- fs/ocfs2/dlm/dlmdebug.c | 87 +- fs/ocfs2/dlm/dlmdomain.c | 29 +- fs/ocfs2/dlm/dlmmaster.c | 387 +++--- fs/ocfs2/dlm/dlmthread.c | 20 +- fs/ocfs2/dlmglue.c | 46 + fs/ocfs2/dlmglue.h | 2 + fs/ocfs2/export.c...

Found 15 patches (out of 162) that appeared relevant to ocfs2 1.4. Please review. Sunil

All, This is hopefully the final drop of the patches for adding global heartbeat to the o2cb stack. The diff from the previous set is here: http://oss.oracle.com/~smushran/global-hb-diff-2010-10-07 Implemented most of the suggestions provided by Joel and Wengang. The most important one was to activate the feature only at the end, Also, got mostly a clean run with checkpatch.pl. Sunil

...fs/ocfs2/cluster/masklog.h | 3 +- fs/ocfs2/cluster/nodemanager.c | 5 + fs/ocfs2/cluster/ocfs2_nodemanager.h | 6 + fs/ocfs2/cluster/tcp.c | 5 + fs/ocfs2/dcache.c | 33 ++- fs/ocfs2/dcache.h | 1 + fs/ocfs2/dlm/dlmcommon.h | 29 ++- fs/ocfs2/dlm/dlmdebug.c | 12 +- fs/ocfs2/dlm/dlmdomain.c | 400 +++++++++++++++++++++++++- fs/ocfs2/dlmglue.c | 8 + fs/ocfs2/file.c | 73 +++-- fs/ocfs2/inode.c | 1 + fs/ocfs2...

...12 +- fs/ocfs2/aops.c | 3 + fs/ocfs2/cluster/masklog.c | 1 + fs/ocfs2/cluster/masklog.h | 1 + fs/ocfs2/cluster/tcp.c | 3 + fs/ocfs2/dir.c | 75 +-- fs/ocfs2/dlm/dlmast.c | 8 +- fs/ocfs2/dlm/dlmcommon.h | 4 +- fs/ocfs2/dlm/dlmconvert.c | 4 +- fs/ocfs2/dlm/dlmdomain.c | 28 +- fs/ocfs2/dlm/dlmlock.c | 6 +- fs/ocfs2/dlm/dlmmaster.c | 30 +- fs/ocfs2/dlm/dlmrecovery.c | 27 +- fs/ocfs2/dlm/dlmthread.c |...

...+- fs/ocfs2/alloc.c | 465 +++++++++++++-- fs/ocfs2/aops.c | 6 +- fs/ocfs2/cluster/sys.c | 9 + fs/ocfs2/cluster/tcp.c | 96 ++-- fs/ocfs2/cluster/tcp_internal.h | 2 + fs/ocfs2/dlm/dlmcommon.h | 49 ++ fs/ocfs2/dlm/dlmdebug.c | 911 +++++++++++++++++++++++++--- fs/ocfs2/dlm/dlmdebug.h | 86 +++ fs/ocfs2/dlm/dlmdomain.c | 70 ++- fs/ocfs2/dlm/dlmlock.c | 22 +- fs/ocfs2/dlm/dlmmaster.c...