From c508925aacb260cd8fd0ad4ee5fccf203a3c95ff Mon Sep 17 00:00:00 2001
From: bobijam <bobijam>
Date: Wed, 13 Aug 2008 02:22:00 +0000
Subject: [PATCH] Branch b1_8_gate b=15924 i=johann

add a test case for bug 15924, combine flock tests code into a single file
flocks_test.c
---
 lustre/ldlm/ldlm_flock.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lustre/ldlm/ldlm_flock.c b/lustre/ldlm/ldlm_flock.c
index f5eb0b9..b158d1d 100644
--- a/lustre/ldlm/ldlm_flock.c
+++ b/lustre/ldlm/ldlm_flock.c
@@ -558,6 +558,7 @@ ldlm_flock_completion_ast(struct ldlm_lock *lock, int flags, void *data)
         RETURN(rc);
  
 granted:
+        OBD_FAIL_TIMEOUT(OBD_FAIL_LDLM_CP_CB_WAIT, 10);
         LDLM_DEBUG(lock, "client-side enqueue granted");
         ns = lock->l_resource->lr_namespace;
         lock_res_and_lock(lock);
-- 
1.8.3.1