LU-8359 ldlm: Wrong evict during failover

[fs/lustre-release.git] / lustre / target / tgt_lastrcvd.c

diff --git a/lustre/target/tgt_lastrcvd.c b/lustre/target/tgt_lastrcvd.c
index c7aecdf..3a55026 100644 (file)
--- a/lustre/target/tgt_lastrcvd.c
+++ b/lustre/target/tgt_lastrcvd.c
@@ -1079,6 +1079,10 @@ int tgt_client_del(const struct lu_env *env, struct obd_export *exp)
                RETURN(-EINVAL);
        }
 
+       /* Do not erase record for recoverable client. */
+       if (exp->exp_obd->obd_fail)
+               RETURN(0);
+
        /* XXX if lcd_uuid were a real obd_uuid, I could use obd_uuid_equals */
        if (!strcmp((char *)ted->ted_lcd->lcd_uuid,
                    (char *)tgt->lut_obd->obd_uuid.uuid) ||
@@ -1105,9 +1109,6 @@ int tgt_client_del(const struct lu_env *env, struct obd_export *exp)
                LBUG();
        }
 
-       /* Do not erase record for recoverable client. */
-       if (exp->exp_flags & OBD_OPT_FAILOVER)
-               RETURN(0);
 
        if (OBD_FAIL_CHECK(OBD_FAIL_TGT_CLIENT_DEL))
                RETURN(0);