1 files changed, 12 insertions, 0 deletions

diff --git a/fs/ocfs2/dlm/dlmmaster.c b/fs/ocfs2/dlm/dlmmaster.c
index 215e41abf101..3689b3592042 100644
--- a/fs/ocfs2/dlm/dlmmaster.c
+++ b/fs/ocfs2/dlm/dlmmaster.c
@@ -1460,6 +1460,18 @@ way_up_top:
 
                 /* take care of the easy cases up front */
                 spin_lock(&res->spinlock);
+
+                /*
+                 * Right after dlm spinlock was released, dlm_thread could have
+                 * purged the lockres. Check if lockres got unhashed. If so
+                 * start over.
+                 */
+                if (hlist_unhashed(&res->hash_node)) {
+                        spin_unlock(&res->spinlock);
+                        dlm_lockres_put(res);
+                        goto way_up_top;
+                }
+
                 if (res->state & (DLM_LOCK_RES_RECOVERING|
                                   DLM_LOCK_RES_MIGRATING)) {
                         spin_unlock(&res->spinlock);