Branch HEAD

[fs/lustre-release.git] / lustre / ldlm / ldlm_flock.c

diff --git a/lustre/ldlm/ldlm_flock.c b/lustre/ldlm/ldlm_flock.c
index 6cb71e7..3abad6f 100644 (file)
--- a/lustre/ldlm/ldlm_flock.c
+++ b/lustre/ldlm/ldlm_flock.c
@@ -399,7 +399,7 @@ restart:
                                                      &rpc_list);
 
                                 unlock_res(res);
-                                rc = ldlm_run_bl_ast_work(&rpc_list);
+                                rc = ldlm_run_ast_work(&rpc_list, LDLM_WORK_BL_AST);
                                 lock_res(res);
                                 if (rc == -ERESTART)
                                         GOTO(restart, -ERESTART);
@@ -431,6 +431,7 @@ ldlm_flock_interrupted_wait(void *data)
 {
         struct ldlm_lock *lock;
         struct lustre_handle lockh;
+        int rc;
         ENTRY;
 
         lock = ((struct ldlm_flock_wait_data *)data)->fwd_lock;
@@ -443,7 +444,10 @@ ldlm_flock_interrupted_wait(void *data)
 
         ldlm_lock_decref_internal(lock, lock->l_req_mode);
         ldlm_lock2handle(lock, &lockh);
-        ldlm_cli_cancel(&lockh);
+        rc = ldlm_cli_cancel(&lockh);
+        if (rc != ELDLM_OK)
+                CERROR("ldlm_cli_cancel: %d\n", rc);
+
         EXIT;
 }