- revert patch from 17110 as it's causing issues with ost cleanup

diff --git a/lustre/ptlrpc/recov_thread.c b/lustre/ptlrpc/recov_thread.c
index 1ffdbd2..5174336 100644 (file)
--- a/lustre/ptlrpc/recov_thread.c
+++ b/lustre/ptlrpc/recov_thread.c
@@ -545,6 +545,11 @@ int llog_obd_repl_cancel(struct llog_ctxt *ctxt,
                 GOTO(out, rc = -ENODEV);
         }
 
+        if (ctxt->loc_obd->obd_stopping) {
+                CDEBUG(D_RPCTRACE, "Obd is stopping for ctxt %p\n", ctxt);
+                GOTO(out, rc = -ENODEV);
+        }
+ 
         if (test_bit(LLOG_LCM_FL_EXIT, &lcm->lcm_flags)) {
                 CDEBUG(D_RPCTRACE, "Commit thread is stopping for ctxt %p\n", 
                        ctxt);