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

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

diff --git a/fs/ocfs2/dlm/dlmdomain.c b/fs/ocfs2/dlm/dlmdomain.c
index 533bd524e41eb087ba6775a0f76bab9f95948754..32fd261ae13d02ce0844285b3cb8c7b529f0a3ab 100644 (file)
--- a/fs/ocfs2/dlm/dlmdomain.c
+++ b/fs/ocfs2/dlm/dlmdomain.c
@@ -1904,7 +1904,7 @@ static int dlm_join_domain(struct dlm_ctxt *dlm)
        }
 
        snprintf(wq_name, O2NM_MAX_NAME_LEN, "dlm_wq-%s", dlm->name);
-       dlm->dlm_worker = create_singlethread_workqueue(wq_name);
+       dlm->dlm_worker = alloc_workqueue(wq_name, WQ_MEM_RECLAIM, 0);
        if (!dlm->dlm_worker) {
                status = -ENOMEM;
                mlog_errno(status);
@@ -2072,7 +2072,7 @@ static struct dlm_ctxt *dlm_alloc_ctxt(const char *domain,
        INIT_LIST_HEAD(&dlm->dlm_eviction_callbacks);
 
        mlog(0, "context init: refcount %u\n",
-                 atomic_read(&dlm->dlm_refs.refcount));
+                 kref_read(&dlm->dlm_refs));
 
 leave:
        if (ret < 0 && dlm) {