From: pschwan <pschwan>
Date: Fri, 6 Jun 2003 19:09:42 +0000 (+0000)
Subject: b=1228
X-Git-Tag: v1_7_100~1^91~141
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=abcf001f9aab9eaf86152343d22b2498535c92bb;p=fs%2Flustre-release.git

b=1228
More debugging: pass the real inode down from ll_clear_inode, so we
can determine in cancel_unused whether the lock's data pointer is wrong
---

diff --git a/lustre/ldlm/ldlm_internal.h b/lustre/ldlm/ldlm_internal.h
new file mode 100644
index 0000000..b8bfdac
--- /dev/null
+++ b/lustre/ldlm/ldlm_internal.h
@@ -0,0 +1 @@
+int ldlm_cancel_lru(struct ldlm_namespace *ns);
diff --git a/lustre/ldlm/ldlm_lib.c b/lustre/ldlm/ldlm_lib.c
index 88c29d7..735e3831 100644
--- a/lustre/ldlm/ldlm_lib.c
+++ b/lustre/ldlm/ldlm_lib.c
@@ -144,7 +144,7 @@ int client_import_disconnect(struct lustre_handle *dlm_handle, int failover)
         if (obd->obd_namespace != NULL) {
                 /* obd_no_recov == local only */
                 ldlm_cli_cancel_unused(obd->obd_namespace, NULL,
-                                       obd->obd_no_recov);
+                                       obd->obd_no_recov, NULL);
                 ldlm_namespace_free(obd->obd_namespace);
                 obd->obd_namespace = NULL;
         }
diff --git a/lustre/llite/llite_internal.h b/lustre/llite/llite_internal.h
new file mode 100644
index 0000000..e53b605
--- /dev/null
+++ b/lustre/llite/llite_internal.h
@@ -0,0 +1,2 @@
+int ll_mdc_cancel_unused(struct lustre_handle *conn, struct inode *inode,
+                         int flags, void *opaque);