X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=kernel%2Ffs%2Focfs2%2Fdlm%2Fdlmrecovery.c;fp=kernel%2Ffs%2Focfs2%2Fdlm%2Fdlmrecovery.c;h=4a338803e7e9280ce6cab1c0dd95ffacbff5ae3b;hb=52f993b8e89487ec9ee15a7fb4979e0f09a45b27;hp=42f0cae93a0a134fbf1d43623bf7fdde6d8f3a26;hpb=c189ccac5702322ed843fe17057035b7222a59b6;p=kvmfornfv.git diff --git a/kernel/fs/ocfs2/dlm/dlmrecovery.c b/kernel/fs/ocfs2/dlm/dlmrecovery.c index 42f0cae93..4a338803e 100644 --- a/kernel/fs/ocfs2/dlm/dlmrecovery.c +++ b/kernel/fs/ocfs2/dlm/dlmrecovery.c @@ -2064,7 +2064,6 @@ void dlm_move_lockres_to_recovery_list(struct dlm_ctxt *dlm, dlm_lock_get(lock); if (lock->convert_pending) { /* move converting lock back to granted */ - BUG_ON(i != DLM_CONVERTING_LIST); mlog(0, "node died with convert pending " "on %.*s. move back to granted list.\n", res->lockname.len, res->lockname.name);