From: bwzhou <bwzhou>
Date: Mon, 25 Feb 2008 11:36:22 +0000 (+0000)
Subject: Branch b1_6
X-Git-Tag: v1_8_0_110~739
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;ds=sidebyside;h=ac9ea909a88a7f46da5c6c39fde329c147f39f9e;p=fs%2Flustre-release.git

Branch b1_6
b=13285
r=johann, deen

print messages to console about locks.
---

diff --git a/lustre/ldlm/ldlm_flock.c b/lustre/ldlm/ldlm_flock.c
index fc0cbf0..bd92a84 100644
--- a/lustre/ldlm/ldlm_flock.c
+++ b/lustre/ldlm/ldlm_flock.c
@@ -448,6 +448,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;
@@ -460,8 +461,10 @@ ldlm_flock_interrupted_wait(void *data)
 
         ldlm_lock_decref_internal(lock, lock->l_req_mode);
         ldlm_lock2handle(lock, &lockh);
-        /* coverity[check_return] */
-        ldlm_cli_cancel(&lockh);
+        rc = ldlm_cli_cancel(&lockh);
+        if (rc != ELDLM_OK)
+                CERROR("ldlm_cli_cancel: %d\n", rc);
+
         EXIT;
 }