X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Fmdt%2Fmdt_handler.c;h=e2811175e279a24dc94ea8fc5f52dd0415311a22;hp=20a2f8e9901446e5d39b26146ee4110dcea35774;hb=c60e949e3b9f7ff19e1a644210cc764ee150ad8b;hpb=3800d05641158608e5a139336c00a781fa9fb8c7

diff --git a/lustre/mdt/mdt_handler.c b/lustre/mdt/mdt_handler.c
index 20a2f8e..e281117 100644
--- a/lustre/mdt/mdt_handler.c
+++ b/lustre/mdt/mdt_handler.c
@@ -5502,7 +5502,7 @@ static int mdt_export_cleanup(struct obd_export *exp)
 				rc = mdt_ctxt_add_dirty_flag(&env, info, mfd);
 
 			/* Don't unlink orphan on failover umount, LU-184 */
-			if (exp->exp_flags & OBD_OPT_FAILOVER) {
+			if (exp->exp_obd->obd_fail) {
 				ma->ma_valid = MA_FLAGS;
 				ma->ma_attr_flags |= MDS_KEEP_ORPHAN;
 			}
@@ -5511,9 +5511,7 @@ static int mdt_export_cleanup(struct obd_export *exp)
         }
         info->mti_mdt = NULL;
         /* cleanup client slot early */
-        /* Do not erase record for recoverable client. */
-        if (!(exp->exp_flags & OBD_OPT_FAILOVER) || exp->exp_failed)
-		tgt_client_del(&env, exp);
+	tgt_client_del(&env, exp);
         lu_env_fini(&env);
 
         RETURN(rc);