search for: dlmdomain

We should check dlm->dlm_state under dlm->spinlock though maybe in this case it doesn't hurt. Signed-off-by: Wengang Wang <wen.gang.wang at oracle.com> --- fs/ocfs2/dlm/dlmdomain.c | 13 ++++++------- 1 files changed, 6 insertions(+), 7 deletions(-) diff --git a/fs/ocfs2/dlm/dlmdomain.c b/fs/ocfs2/dlm/dlmdomain.c index 6b5a492..ab82add 100644 --- a/fs/ocfs2/dlm/dlmdomain.c +++ b/fs/ocfs2/dlm/dlmdomain.c @@ -796,7 +796,7 @@ static int dlm_query_join_handler(struct o2net_m...

Look at this code from dlmdomain.c: ----------------------------------------------------------------------- /* If we're racing another node to the join, then we * need to back off temporarily and let them * complete. */ #define DLM_JOIN_TIMEOUT_MSECS 90000 if...

o2dlm join and leave messages are more than informational as they are required is debugging locking issues. This patch changes them from KERN_INFO to KERN_NOTICE. Signed-off-by: Sunil Mushran <sunil.mushran at oracle.com> --- fs/ocfs2/dlm/dlmdomain.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/fs/ocfs2/dlm/dlmdomain.c b/fs/ocfs2/dlm/dlmdomain.c index 988c905..bcbbe56 100644 --- a/fs/ocfs2/dlm/dlmdomain.c +++ b/fs/ocfs2/dlm/dlmdomain.c @@ -511,7 +511,7 @@ static void __dlm_print_nodes(struct dlm_ctxt *dlm)...

Remove some pointless conditionals before kfree(). Signed-off-by: Wei Yongjun <yjwei at cn.fujitsu.com> --- fs/ocfs2/alloc.c | 3 +-- fs/ocfs2/cluster/heartbeat.c | 6 ++---- fs/ocfs2/cluster/tcp.c | 6 ++---- fs/ocfs2/dlm/dlmdomain.c | 3 +-- fs/ocfs2/dlm/dlmrecovery.c | 6 ++---- fs/ocfs2/extent_map.c | 3 +-- fs/ocfs2/journal.c | 9 +++------ fs/ocfs2/localalloc.c | 9 +++------ fs/ocfs2/super.c | 6 ++---- 9 files changed, 17 insertions(+), 34 deletions(-) diff -...

...i++) { - bucket = &(dlm->lockres_hash[i]); + bucket = dlm_lockres_hash(dlm, i); hlist_for_each_entry(res, iter, bucket, hash_node) { /* always prune any $RECOVERY entries for dead nodes, * otherwise hangs can occur during later recovery */ diff -up ./svnocfs2-1.2/fs/ocfs2/dlm/dlmdomain.c.orig ./svnocfs2-1.2/fs/ocfs2/dlm/dlmdomain.c --- ./svnocfs2-1.2/fs/ocfs2/dlm/dlmdomain.c.orig 2009-04-22 11:00:47.000000000 +0800 +++ ./svnocfs2-1.2/fs/ocfs2/dlm/dlmdomain.c 2009-04-22 11:33:26.000000000 +0800 @@ -49,6 +49,34 @@ #define MLOG_MASK_PREFIX (ML_DLM|ML_DLM_DOMAIN) #include "clu...

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

...seconds. I tried following procedures to solve that. It seems solved. 1. O2HB_DEFAULT_DEAD_THRESHOLD changed larger than previous value. It's defined in hearbeat.h. 2. The Skip_flag defined as a global parameter. 3. When the number of connected nodes becomes two , skip_flag is turned on by dlmdomain.c 4. If the skip_flag is ON, the o2hb_do_disk_hearbeat is not executed. 5. When the number of connected nodes becomes below two, skip_flag is turned off by dlmdomain.c. 6. If the skip_flag is OFF, the o2hb_do_disk_hearbeat is executed. If one node is active, the o2hb_do_disk_hearbeat is execute...

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

use multiple pages for the hash table. mainline git commit: 03d864c02c3ea803b1718940ac6953a257182d7a Authored-by: Daniel Phillips <phillips at google.com> Signed-off-by: Wengang Wang <wen.gang.wang at oracle.com> -- Index: ocfs2-1.2/fs/ocfs2/dlm/dlmdomain.c =================================================================== --- ocfs2-1.2/fs/ocfs2/dlm/dlmdomain.c (revision 1) +++ ocfs2-1.2/fs/ocfs2/dlm/dlmdomain.c (revision 2) @@ -79,6 +79,33 @@ static inline void byte_copymap(u8 dmap[ byte_set_bit(nn, dmap); } +static void dlm_free_pagevec(vo...

The versioning information is confusing for end-users. The numbers are stuck at 1.5.0 when the tools have moved to 1.8.3. I suggest removing the versioning system in the kernel altogether and let the kernel version be the guide to debug issues. However, if you think versioning is still required, please state the reason and modify the version string in the ver.* files to reflect the uptodate

Please review the list of patches being applied to the ocfs2 1.4 tree. All patches list the mainline commit hash. Thanks 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

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

...an Ye (1): ocfs2: skip existing hole when removing the last extent_rec in punching-hole codes. fs/configfs/dir.c | 39 ++++++++++++++++++++++----- fs/ocfs2/cluster/heartbeat.c | 61 +++++++++++++++++++++++++++++------------ fs/ocfs2/dir.c | 2 +- fs/ocfs2/dlm/dlmdomain.c | 3 +- fs/ocfs2/dlm/dlmmaster.c | 3 ++ fs/ocfs2/file.c | 12 ++++++++ fs/ocfs2/journal.c | 3 ++ 7 files changed, 96 insertions(+), 27 deletions(-)

...ing CoW. Wengang Wang (2): ocfs2/dlm: don't access beyond bitmap size ocfs2/dlm: Remove BUG_ON from migration in the rare case of a down node fs/jbd2/journal.c | 15 +- fs/jbd2/transaction.c | 9 +- fs/ocfs2/aops.c | 94 +++++++------- fs/ocfs2/dlm/dlmdomain.c | 3 +- fs/ocfs2/dlm/dlmmaster.c | 22 ++- fs/ocfs2/dlm/dlmrecovery.c | 2 +- fs/ocfs2/file.c | 309 +++++++++++++++++++++++++++++++++++--------- fs/ocfs2/file.h | 6 +- fs/ocfs2/journal.c | 30 ++-- fs/ocfs2/localalloc.c | 7 + fs/ocfs2/quo...

...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/inode.h | 12 +- fs/ocfs2/ioctl.c | 356 +++++++++++++...

...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 | 16 +- fs/ocfs2/dlm/dlmunlock.c | 3 +- fs/ocfs2/file.c | 2...

...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 | 84 ++- fs/ocfs2/inode.c | 48 +- fs/ocfs2/inode.h...

...too ocfs2: Wakeup down convert thread just after clearing OCFS2-LOCK-UPCONVERT-FINISHING ocfs2: dlm Hard code the values for enums ocfs2: dlm Minor cleanup ocfs2: dlm Cleanup dlmdebug.c ocfs2: dlm make existing convertion precedent over new lock ocfs2: dlm Cleanup mlogs in dlmthread.c dlmast.c and dlmdomain.c ocfs2: Treat writes as new when holes span across page boundary ocfs2: Use the right group in nfs sync check ocfs2: enable discontig block group support ocfs2: Set ac_last_group properly with discontig group ocfs2: Free block to the right block group ocfs2: Add ocfs2_gd_is_discontig ocfs2: ocfs2_...

...uster/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 | 200 ++----- fs/ocfs2/dlmglue.c | 645 ++++++++++++-------- fs/ocfs2/dlmglue.h | 5 +- fs/ocfs2/file.c...