- fix for 18148

b:18148
i:shadow,bzzz

diff --git a/lustre/ldlm/ldlm_lib.c b/lustre/ldlm/ldlm_lib.c
index 377ab55..5e1ab0d 100644 (file)
--- a/lustre/ldlm/ldlm_lib.c
+++ b/lustre/ldlm/ldlm_lib.c
@@ -592,6 +592,7 @@ int target_recovery_check_and_stop(struct obd_device *obd)
 
         spin_lock_bh(&obd->obd_processing_task_lock);
         abort_recovery = obd->obd_abort_recovery;
+        obd->obd_abort_recovery = 0;
         spin_unlock_bh(&obd->obd_processing_task_lock);
         if (!abort_recovery)
                 return 0;

diff --git a/lustre/obdclass/genops.c b/lustre/obdclass/genops.c
index 2b59509..ba6164e 100644 (file)
--- a/lustre/obdclass/genops.c
+++ b/lustre/obdclass/genops.c
@@ -1161,6 +1161,7 @@ void class_handle_stale_exports(struct obd_device *obd)
         }
 #ifndef HAVE_DELAYED_RECOVERY
         /* delayed recovery is turned off, evict all delayed exports */
+        list_splice_init(&delay_list, &evict_list);
         list_splice_init(&obd->obd_delayed_exports, &evict_list);
 #endif
         spin_unlock(&obd->obd_dev_lock);