From c3b83efd28ea1ed676d2f720cfe822eede321773 Mon Sep 17 00:00:00 2001
From: ericm <ericm>
Date: Wed, 23 Jul 2008 19:13:17 +0000
Subject: [PATCH] branch: HEAD remove a bad assertion. b=16439 r=wangdi r=umka

---
 lustre/ldlm/ldlm_lib.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/lustre/ldlm/ldlm_lib.c b/lustre/ldlm/ldlm_lib.c
index 23c06ba..1e5d6d6 100644
--- a/lustre/ldlm/ldlm_lib.c
+++ b/lustre/ldlm/ldlm_lib.c
@@ -1544,8 +1544,6 @@ static int handle_recovery_req(struct ptlrpc_thread *thread,
 
 static void resume_recovery_timer(struct obd_device *obd)
 {
-        LASSERT(!cfs_timer_is_armed(&obd->obd_recovery_timer));
-
         /* to be safe, make it at least OBD_RECOVERY_FACTOR * obd_timeout */
         reset_recovery_timer(obd, OBD_RECOVERY_FACTOR * obd_timeout, 1);
 }
-- 
1.8.3.1