ocfs2_dlm: Make dlmunlock() wait for migration to complete

dlmunlock() was not waiting for migration to complete before releasing locks
on locally mastered locks.
Signed-off-by: NKurt Hackel <kurt.hackel@oracle.com>
Signed-off-by: NSunil Mushran <Sunil.Mushran@oracle.com>
Signed-off-by: NMark Fasheh <mark.fasheh@oracle.com>

fs/ocfs2/dlm/dlmrecovery.c

@@ -1763,6 +1763,7 @@ static int dlm_process_recovery_data(struct dlm_ctxt *dlm,
 					       "with cookie %u:%llu!\n",
 					       dlm_get_lock_cookie_node(c),
 					       dlm_get_lock_cookie_seq(c));
+				__dlm_print_one_lock_resource(res);
 				BUG();
 			}
 			BUG_ON(lock->ml.node != ml->node);

fs/ocfs2/dlm/dlmunlock.c

@@ -147,6 +147,10 @@ static enum dlm_status dlmunlock_common(struct dlm_ctxt *dlm,
 		goto leave;
 	}
 
+	if (res->state & DLM_LOCK_RES_MIGRATING) {
+		status = DLM_MIGRATING;
+		goto leave;
+	}
 
 	/* see above for what the spec says about
 	 * LKM_CANCEL and the lock queue state */