b=16774,21252

Disable lock cancelling before replay due to bug 21252.

diff --git a/lustre/ldlm/ldlm_request.c b/lustre/ldlm/ldlm_request.c
index bbd6ea9..573ecac 100644 (file)
--- a/lustre/ldlm/ldlm_request.c
+++ b/lustre/ldlm/ldlm_request.c
@@ -51,7 +51,7 @@ CFS_MODULE_PARM(ldlm_enqueue_min, "i", int, 0644,
                 "lock enqueue timeout minimum");
 
 /* in client side, whether the cached locks will be canceled before replay */
-unsigned int ldlm_cancel_unused_locks_before_replay = 1;
+unsigned int ldlm_cancel_unused_locks_before_replay = 0;
 
 static void interrupted_completion_wait(void *data)
 {