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

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

diff --git a/fs/ocfs2/dlm/dlmmaster.c b/fs/ocfs2/dlm/dlmmaster.c
index a464c8088170aa3fc40267e79cc84b8bd39139a7..7025d8c279991e36ec5f9eaaebf585254b3604dd 100644 (file)
--- a/fs/ocfs2/dlm/dlmmaster.c
+++ b/fs/ocfs2/dlm/dlmmaster.c
@@ -233,7 +233,7 @@ static void __dlm_put_mle(struct dlm_master_list_entry *mle)
 
        assert_spin_locked(&dlm->spinlock);
        assert_spin_locked(&dlm->master_lock);
-       if (!atomic_read(&mle->mle_refs.refcount)) {
+       if (!kref_read(&mle->mle_refs)) {
                /* this may or may not crash, but who cares.
                 * it's a BUG. */
                mlog(ML_ERROR, "bad mle: %p\n", mle);
@@ -1124,9 +1124,9 @@ static int dlm_wait_for_lock_mastery(struct dlm_ctxt *dlm,
                unsigned long timeo = msecs_to_jiffies(DLM_MASTERY_TIMEOUT_MS);
 
                /*
-               if (atomic_read(&mle->mle_refs.refcount) < 2)
+               if (kref_read(&mle->mle_refs) < 2)
                        mlog(ML_ERROR, "mle (%p) refs=%d, name=%.*s\n", mle,
-                       atomic_read(&mle->mle_refs.refcount),
+                       kref_read(&mle->mle_refs),
                        res->lockname.len, res->lockname.name);
                */
                atomic_set(&mle->woken, 0);
@@ -1979,7 +1979,7 @@ int dlm_assert_master_handler(struct o2net_msg *msg, u32 len, void *data,
                 * on this mle. */
                spin_lock(&dlm->master_lock);
 
-               rr = atomic_read(&mle->mle_refs.refcount);
+               rr = kref_read(&mle->mle_refs);
                if (mle->inuse > 0) {
                        if (extra_ref && rr < 3)
                                err = 1;