diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-26 19:06:08 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-26 19:06:08 -0400 |
| commit | eb99adde31b7d85c67a5e1c2fa5e098e1056dd79 (patch) | |
| tree | 05d61251361c04f3afa64c5b1fe162558724d345 /fs/ocfs2/dlm/dlmdebug.c | |
| parent | f6e6e883730aff2718610d3eba7608fcf73328ed (diff) | |
| parent | 3fb5a9891dbb553dda96783dbc0dc4e77cbb2529 (diff) | |
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2
* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2: (56 commits)
[PATCH] fs/ocfs2/dlm/: cleanups
ocfs2: fix compiler warnings in dlm_convert_lock_handler()
ocfs2: dlm_print_one_mle() needs to be defined
ocfs2: remove whitespace in dlmunlock.c
ocfs2: move dlm work to a private work queue
ocfs2: fix incorrect error returns
ocfs2: tune down some noisy messages during dlm recovery
ocfs2: display message before waiting for recovery to complete
ocfs2: mlog in dlm_convert_lock_handler() should be ML_ERROR
ocfs2: retry operations when a lock is marked in recovery
ocfs2: use cond_resched() in dlm_thread()
ocfs2: use GFP_NOFS in some dlm operations
ocfs2: wait for recovery when starting lock mastery
ocfs2: continue recovery when a dead node is encountered
ocfs2: remove unneccesary spin_unlock() in dlm_remaster_locks()
ocfs2: dlm_remaster_locks() should never exit without completing
ocfs2: special case recovery lock in dlmlock_remote()
ocfs2: pending mastery asserts and migrations should block each other
ocfs2: temporarily disable automatic lock migration
ocfs2: do not unconditionally purge the lockres in dlmlock_remote()
...
Diffstat (limited to 'fs/ocfs2/dlm/dlmdebug.c')
| -rw-r--r-- | fs/ocfs2/dlm/dlmdebug.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/ocfs2/dlm/dlmdebug.c b/fs/ocfs2/dlm/dlmdebug.c index c7eae5d3324e..3f6c8d88f7af 100644 --- a/fs/ocfs2/dlm/dlmdebug.c +++ b/fs/ocfs2/dlm/dlmdebug.c | |||
| @@ -37,10 +37,8 @@ | |||
| 37 | 37 | ||
| 38 | #include "dlmapi.h" | 38 | #include "dlmapi.h" |
| 39 | #include "dlmcommon.h" | 39 | #include "dlmcommon.h" |
| 40 | #include "dlmdebug.h" | ||
| 41 | 40 | ||
| 42 | #include "dlmdomain.h" | 41 | #include "dlmdomain.h" |
| 43 | #include "dlmdebug.h" | ||
| 44 | 42 | ||
| 45 | #define MLOG_MASK_PREFIX ML_DLM | 43 | #define MLOG_MASK_PREFIX ML_DLM |
| 46 | #include "cluster/masklog.h" | 44 | #include "cluster/masklog.h" |
| @@ -120,6 +118,7 @@ void dlm_print_one_lock(struct dlm_lock *lockid) | |||
| 120 | } | 118 | } |
| 121 | EXPORT_SYMBOL_GPL(dlm_print_one_lock); | 119 | EXPORT_SYMBOL_GPL(dlm_print_one_lock); |
| 122 | 120 | ||
| 121 | #if 0 | ||
| 123 | void dlm_dump_lock_resources(struct dlm_ctxt *dlm) | 122 | void dlm_dump_lock_resources(struct dlm_ctxt *dlm) |
| 124 | { | 123 | { |
| 125 | struct dlm_lock_resource *res; | 124 | struct dlm_lock_resource *res; |
| @@ -136,12 +135,13 @@ void dlm_dump_lock_resources(struct dlm_ctxt *dlm) | |||
| 136 | 135 | ||
| 137 | spin_lock(&dlm->spinlock); | 136 | spin_lock(&dlm->spinlock); |
| 138 | for (i=0; i<DLM_HASH_BUCKETS; i++) { | 137 | for (i=0; i<DLM_HASH_BUCKETS; i++) { |
| 139 | bucket = &(dlm->lockres_hash[i]); | 138 | bucket = dlm_lockres_hash(dlm, i); |
| 140 | hlist_for_each_entry(res, iter, bucket, hash_node) | 139 | hlist_for_each_entry(res, iter, bucket, hash_node) |
| 141 | dlm_print_one_lock_resource(res); | 140 | dlm_print_one_lock_resource(res); |
| 142 | } | 141 | } |
| 143 | spin_unlock(&dlm->spinlock); | 142 | spin_unlock(&dlm->spinlock); |
| 144 | } | 143 | } |
| 144 | #endif /* 0 */ | ||
| 145 | 145 | ||
| 146 | static const char *dlm_errnames[] = { | 146 | static const char *dlm_errnames[] = { |
| 147 | [DLM_NORMAL] = "DLM_NORMAL", | 147 | [DLM_NORMAL] = "DLM_NORMAL", |