aboutsummaryrefslogtreecommitdiffstats
path: root/fs/ocfs2/dlm/dlmdebug.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/ocfs2/dlm/dlmdebug.c')
-rw-r--r--fs/ocfs2/dlm/dlmdebug.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/fs/ocfs2/dlm/dlmdebug.c b/fs/ocfs2/dlm/dlmdebug.c
index e7b760deefae..9b984cae4c4e 100644
--- a/fs/ocfs2/dlm/dlmdebug.c
+++ b/fs/ocfs2/dlm/dlmdebug.c
@@ -81,7 +81,7 @@ static void __dlm_print_lock(struct dlm_lock *lock)
81 lock->ml.type, lock->ml.convert_type, lock->ml.node, 81 lock->ml.type, lock->ml.convert_type, lock->ml.node,
82 dlm_get_lock_cookie_node(be64_to_cpu(lock->ml.cookie)), 82 dlm_get_lock_cookie_node(be64_to_cpu(lock->ml.cookie)),
83 dlm_get_lock_cookie_seq(be64_to_cpu(lock->ml.cookie)), 83 dlm_get_lock_cookie_seq(be64_to_cpu(lock->ml.cookie)),
84 atomic_read(&lock->lock_refs.refcount), 84 kref_read(&lock->lock_refs),
85 (list_empty(&lock->ast_list) ? 'y' : 'n'), 85 (list_empty(&lock->ast_list) ? 'y' : 'n'),
86 (lock->ast_pending ? 'y' : 'n'), 86 (lock->ast_pending ? 'y' : 'n'),
87 (list_empty(&lock->bast_list) ? 'y' : 'n'), 87 (list_empty(&lock->bast_list) ? 'y' : 'n'),
@@ -106,7 +106,7 @@ void __dlm_print_one_lock_resource(struct dlm_lock_resource *res)
106 printk("lockres: %s, owner=%u, state=%u\n", 106 printk("lockres: %s, owner=%u, state=%u\n",
107 buf, res->owner, res->state); 107 buf, res->owner, res->state);
108 printk(" last used: %lu, refcnt: %u, on purge list: %s\n", 108 printk(" last used: %lu, refcnt: %u, on purge list: %s\n",
109 res->last_used, atomic_read(&res->refs.refcount), 109 res->last_used, kref_read(&res->refs),
110 list_empty(&res->purge) ? "no" : "yes"); 110 list_empty(&res->purge) ? "no" : "yes");
111 printk(" on dirty list: %s, on reco list: %s, " 111 printk(" on dirty list: %s, on reco list: %s, "
112 "migrating pending: %s\n", 112 "migrating pending: %s\n",
@@ -298,7 +298,7 @@ static int dump_mle(struct dlm_master_list_entry *mle, char *buf, int len)
298 mle_type, mle->master, mle->new_master, 298 mle_type, mle->master, mle->new_master,
299 !list_empty(&mle->hb_events), 299 !list_empty(&mle->hb_events),
300 !!mle->inuse, 300 !!mle->inuse,
301 atomic_read(&mle->mle_refs.refcount)); 301 kref_read(&mle->mle_refs));
302 302
303 out += snprintf(buf + out, len - out, "Maybe="); 303 out += snprintf(buf + out, len - out, "Maybe=");
304 out += stringify_nodemap(mle->maybe_map, O2NM_MAX_NODES, 304 out += stringify_nodemap(mle->maybe_map, O2NM_MAX_NODES,
@@ -494,7 +494,7 @@ static int dump_lock(struct dlm_lock *lock, int list_type, char *buf, int len)
494 lock->ast_pending, lock->bast_pending, 494 lock->ast_pending, lock->bast_pending,
495 lock->convert_pending, lock->lock_pending, 495 lock->convert_pending, lock->lock_pending,
496 lock->cancel_pending, lock->unlock_pending, 496 lock->cancel_pending, lock->unlock_pending,
497 atomic_read(&lock->lock_refs.refcount)); 497 kref_read(&lock->lock_refs));
498 spin_unlock(&lock->spinlock); 498 spin_unlock(&lock->spinlock);
499 499
500 return out; 500 return out;
@@ -521,7 +521,7 @@ static int dump_lockres(struct dlm_lock_resource *res, char *buf, int len)
521 !list_empty(&res->recovering), 521 !list_empty(&res->recovering),
522 res->inflight_locks, res->migration_pending, 522 res->inflight_locks, res->migration_pending,
523 atomic_read(&res->asts_reserved), 523 atomic_read(&res->asts_reserved),
524 atomic_read(&res->refs.refcount)); 524 kref_read(&res->refs));
525 525
526 /* refmap */ 526 /* refmap */
527 out += snprintf(buf + out, len - out, "RMAP:"); 527 out += snprintf(buf + out, len - out, "RMAP:");
@@ -777,7 +777,7 @@ static int debug_state_print(struct dlm_ctxt *dlm, char *buf, int len)
777 /* Purge Count: xxx Refs: xxx */ 777 /* Purge Count: xxx Refs: xxx */
778 out += snprintf(buf + out, len - out, 778 out += snprintf(buf + out, len - out,
779 "Purge Count: %d Refs: %d\n", dlm->purge_count, 779 "Purge Count: %d Refs: %d\n", dlm->purge_count,
780 atomic_read(&dlm->dlm_refs.refcount)); 780 kref_read(&dlm->dlm_refs));
781 781
782 /* Dead Node: xxx */ 782 /* Dead Node: xxx */
783 out += snprintf(buf + out, len - out, 783 out += snprintf(buf + out, len - out,