Merge branches 'pm-core', 'pm-qos', 'pm-domains' and 'pm-opp'

[linux.git] / fs / ocfs2 / dlm / dlmdebug.c

diff --git a/fs/ocfs2/dlm/dlmdebug.c b/fs/ocfs2/dlm/dlmdebug.c
index e7b760deefaee65402416e187ad4e2b40fc13e62..9b984cae4c4e0dc6f7b85b02baba6cadd11ac0a4 100644 (file)
--- 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)
               lock->ml.type, lock->ml.convert_type, lock->ml.node,
               dlm_get_lock_cookie_node(be64_to_cpu(lock->ml.cookie)),
               dlm_get_lock_cookie_seq(be64_to_cpu(lock->ml.cookie)),
-              atomic_read(&lock->lock_refs.refcount),
+              kref_read(&lock->lock_refs),
               (list_empty(&lock->ast_list) ? 'y' : 'n'),
               (lock->ast_pending ? 'y' : 'n'),
               (list_empty(&lock->bast_list) ? 'y' : 'n'),
@@ -106,7 +106,7 @@ void __dlm_print_one_lock_resource(struct dlm_lock_resource *res)
        printk("lockres: %s, owner=%u, state=%u\n",
               buf, res->owner, res->state);
        printk("  last used: %lu, refcnt: %u, on purge list: %s\n",
-              res->last_used, atomic_read(&res->refs.refcount),
+              res->last_used, kref_read(&res->refs),
               list_empty(&res->purge) ? "no" : "yes");
        printk("  on dirty list: %s, on reco list: %s, "
               "migrating pending: %s\n",
@@ -298,7 +298,7 @@ static int dump_mle(struct dlm_master_list_entry *mle, char *buf, int len)
                        mle_type, mle->master, mle->new_master,
                        !list_empty(&mle->hb_events),
                        !!mle->inuse,
-                       atomic_read(&mle->mle_refs.refcount));
+                       kref_read(&mle->mle_refs));
 
        out += snprintf(buf + out, len - out, "Maybe=");
        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)
                       lock->ast_pending, lock->bast_pending,
                       lock->convert_pending, lock->lock_pending,
                       lock->cancel_pending, lock->unlock_pending,
-                      atomic_read(&lock->lock_refs.refcount));
+                      kref_read(&lock->lock_refs));
        spin_unlock(&lock->spinlock);
 
        return out;
@@ -521,7 +521,7 @@ static int dump_lockres(struct dlm_lock_resource *res, char *buf, int len)
                        !list_empty(&res->recovering),
                        res->inflight_locks, res->migration_pending,
                        atomic_read(&res->asts_reserved),
-                       atomic_read(&res->refs.refcount));
+                       kref_read(&res->refs));
 
        /* refmap */
        out += snprintf(buf + out, len - out, "RMAP:");
@@ -777,7 +777,7 @@ static int debug_state_print(struct dlm_ctxt *dlm, char *buf, int len)
        /* Purge Count: xxx  Refs: xxx */
        out += snprintf(buf + out, len - out,
                        "Purge Count: %d  Refs: %d\n", dlm->purge_count,
-                       atomic_read(&dlm->dlm_refs.refcount));
+                       kref_read(&dlm->dlm_refs));
 
        /* Dead Node: xxx */
        out += snprintf(buf + out, len - out,