Branch b1_8

b=20149
i=johann

add more debug info.

diff --git a/lustre/ldlm/ldlm_resource.c b/lustre/ldlm/ldlm_resource.c
index 7d03ea8..99e85af 100644 (file)
--- a/lustre/ldlm/ldlm_resource.c
+++ b/lustre/ldlm/ldlm_resource.c
@@ -500,18 +500,23 @@ int ldlm_namespace_cleanup(struct ldlm_namespace *ns, int flags)
                         cleanup_resource(res, &res->lr_waiting, flags);
 
                         spin_lock(&ns->ns_hash_lock);
-                        tmp  = tmp->next;
+                        tmp = tmp->next;
 
                         /* XXX: former stuff caused issues in case of race
                          * between ldlm_namespace_cleanup() and lockd() when
                          * client gets blocking ast when lock gets distracted by
                          * server. This is 1_4 branch solution, let's see how
                          * will it behave. */
-                        if (!ldlm_resource_putref_locked(res))
-                                CDEBUG(D_INFO,
-                                       "Namespace %s resource refcount nonzero "
+                        if (!ldlm_resource_putref_locked(res)) {
+                                CERROR("Namespace %s resource refcount nonzero "
                                        "(%d) after lock cleanup; forcing cleanup.\n",
                                        ns->ns_name, atomic_read(&res->lr_refcount));
+                                CERROR("Resource: %p ("LPU64"/"LPU64"/"LPU64"/"
+                                       LPU64") (rc: %d)\n", res,
+                                       res->lr_name.name[0], res->lr_name.name[1],
+                                       res->lr_name.name[2], res->lr_name.name[3],
+                                       atomic_read(&res->lr_refcount));
+                        }
                 }
                 spin_unlock(&ns->ns_hash_lock);
         }