diff options
Diffstat (limited to 'fs/ocfs2/dlm/dlmdebug.c')
| -rw-r--r-- | fs/ocfs2/dlm/dlmdebug.c | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/fs/ocfs2/dlm/dlmdebug.c b/fs/ocfs2/dlm/dlmdebug.c index 54f61b76ab51..c7eae5d3324e 100644 --- a/fs/ocfs2/dlm/dlmdebug.c +++ b/fs/ocfs2/dlm/dlmdebug.c | |||
| @@ -72,8 +72,10 @@ void __dlm_print_one_lock_resource(struct dlm_lock_resource *res) | |||
| 72 | lock = list_entry(iter2, struct dlm_lock, list); | 72 | lock = list_entry(iter2, struct dlm_lock, list); |
| 73 | spin_lock(&lock->spinlock); | 73 | spin_lock(&lock->spinlock); |
| 74 | mlog(ML_NOTICE, " type=%d, conv=%d, node=%u, " | 74 | mlog(ML_NOTICE, " type=%d, conv=%d, node=%u, " |
| 75 | "cookie=%"MLFu64", ast=(empty=%c,pend=%c), bast=(empty=%c,pend=%c)\n", | 75 | "cookie=%u:%llu, ast=(empty=%c,pend=%c), bast=(empty=%c,pend=%c)\n", |
| 76 | lock->ml.type, lock->ml.convert_type, lock->ml.node, lock->ml.cookie, | 76 | lock->ml.type, lock->ml.convert_type, lock->ml.node, |
| 77 | dlm_get_lock_cookie_node(lock->ml.cookie), | ||
| 78 | dlm_get_lock_cookie_seq(lock->ml.cookie), | ||
| 77 | list_empty(&lock->ast_list) ? 'y' : 'n', | 79 | list_empty(&lock->ast_list) ? 'y' : 'n', |
| 78 | lock->ast_pending ? 'y' : 'n', | 80 | lock->ast_pending ? 'y' : 'n', |
| 79 | list_empty(&lock->bast_list) ? 'y' : 'n', | 81 | list_empty(&lock->bast_list) ? 'y' : 'n', |
| @@ -85,8 +87,10 @@ void __dlm_print_one_lock_resource(struct dlm_lock_resource *res) | |||
| 85 | lock = list_entry(iter2, struct dlm_lock, list); | 87 | lock = list_entry(iter2, struct dlm_lock, list); |
| 86 | spin_lock(&lock->spinlock); | 88 | spin_lock(&lock->spinlock); |
| 87 | mlog(ML_NOTICE, " type=%d, conv=%d, node=%u, " | 89 | mlog(ML_NOTICE, " type=%d, conv=%d, node=%u, " |
| 88 | "cookie=%"MLFu64", ast=(empty=%c,pend=%c), bast=(empty=%c,pend=%c)\n", | 90 | "cookie=%u:%llu, ast=(empty=%c,pend=%c), bast=(empty=%c,pend=%c)\n", |
| 89 | lock->ml.type, lock->ml.convert_type, lock->ml.node, lock->ml.cookie, | 91 | lock->ml.type, lock->ml.convert_type, lock->ml.node, |
| 92 | dlm_get_lock_cookie_node(lock->ml.cookie), | ||
| 93 | dlm_get_lock_cookie_seq(lock->ml.cookie), | ||
| 90 | list_empty(&lock->ast_list) ? 'y' : 'n', | 94 | list_empty(&lock->ast_list) ? 'y' : 'n', |
| 91 | lock->ast_pending ? 'y' : 'n', | 95 | lock->ast_pending ? 'y' : 'n', |
| 92 | list_empty(&lock->bast_list) ? 'y' : 'n', | 96 | list_empty(&lock->bast_list) ? 'y' : 'n', |
| @@ -98,8 +102,10 @@ void __dlm_print_one_lock_resource(struct dlm_lock_resource *res) | |||
| 98 | lock = list_entry(iter2, struct dlm_lock, list); | 102 | lock = list_entry(iter2, struct dlm_lock, list); |
| 99 | spin_lock(&lock->spinlock); | 103 | spin_lock(&lock->spinlock); |
| 100 | mlog(ML_NOTICE, " type=%d, conv=%d, node=%u, " | 104 | mlog(ML_NOTICE, " type=%d, conv=%d, node=%u, " |
| 101 | "cookie=%"MLFu64", ast=(empty=%c,pend=%c), bast=(empty=%c,pend=%c)\n", | 105 | "cookie=%u:%llu, ast=(empty=%c,pend=%c), bast=(empty=%c,pend=%c)\n", |
| 102 | lock->ml.type, lock->ml.convert_type, lock->ml.node, lock->ml.cookie, | 106 | lock->ml.type, lock->ml.convert_type, lock->ml.node, |
| 107 | dlm_get_lock_cookie_node(lock->ml.cookie), | ||
| 108 | dlm_get_lock_cookie_seq(lock->ml.cookie), | ||
| 103 | list_empty(&lock->ast_list) ? 'y' : 'n', | 109 | list_empty(&lock->ast_list) ? 'y' : 'n', |
| 104 | lock->ast_pending ? 'y' : 'n', | 110 | lock->ast_pending ? 'y' : 'n', |
| 105 | list_empty(&lock->bast_list) ? 'y' : 'n', | 111 | list_empty(&lock->bast_list) ? 'y' : 'n', |