ocfs2: race between umount and unfinished remastering during recovery

[firefly-linux-kernel-4.4.55.git] / fs / ocfs2 / dlm / dlmmaster.c

diff --git a/fs/ocfs2/dlm/dlmmaster.c b/fs/ocfs2/dlm/dlmmaster.c
index 82abf0cc9a12e2fbc8531f2542830d07ed100293..3ec906ef5d9a622ff4b130f12907d503bd89c3e0 100644 (file)
--- a/fs/ocfs2/dlm/dlmmaster.c
+++ b/fs/ocfs2/dlm/dlmmaster.c
@@ -2405,6 +2405,10 @@ static int dlm_is_lockres_migrateable(struct dlm_ctxt *dlm,
        if (res->state & DLM_LOCK_RES_MIGRATING)
                return 0;
 
+       /* delay migration when the lockres is in RECOCERING state */
+       if (res->state & DLM_LOCK_RES_RECOVERING)
+               return 0;
+
        if (res->owner != dlm->node_num)
                return 0;