diff --git a/[refs] b/[refs]
index 39458f8212e6..41875a9d4642 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ee19a77956cb65c5da54d85a5efefe50b39fa6e5
+refs/heads/master: 5c2c9d383ef7f7cfc02d6355798b95988de359b4
diff --git a/trunk/fs/ocfs2/dlm/dlmthread.c b/trunk/fs/ocfs2/dlm/dlmthread.c
index 2b264c6ba039..cebd089f8955 100644
--- a/trunk/fs/ocfs2/dlm/dlmthread.c
+++ b/trunk/fs/ocfs2/dlm/dlmthread.c
@@ -76,7 +76,7 @@ void __dlm_wait_on_lockres_flags(struct dlm_lock_resource *res, int flags)
 		goto repeat;
 	}
 	remove_wait_queue(&res->wq, &wait);
-	current->state = TASK_RUNNING;
+	__set_current_state(TASK_RUNNING);
 }
 
 int __dlm_lockres_has_locks(struct dlm_lock_resource *res)