Replace ldlm_lock's connection handle with an export handle. (Always

[fs/lustre-release.git] / lustre / include / linux / lustre_dlm.h

diff --git a/lustre/include/linux/lustre_dlm.h b/lustre/include/linux/lustre_dlm.h
index e98475c..5c3413c 100644 (file)
--- a/lustre/include/linux/lustre_dlm.h
+++ b/lustre/include/linux/lustre_dlm.h
@@ -111,13 +111,14 @@ typedef int (*ldlm_blocking_callback)(struct ldlm_lock *lock,
 typedef int (*ldlm_completion_callback)(struct ldlm_lock *lock, int flags); 
 
 struct ldlm_lock {
-        __u64                  l_random;
+        __u64                 l_random;
         int                   l_refc;
         struct ldlm_resource *l_resource;
         struct ldlm_lock     *l_parent;
         struct list_head      l_children;
         struct list_head      l_childof;
         struct list_head      l_res_link; /*position in one of three res lists*/
+        struct list_head      l_inode_link; /* position in inode info list */
 
         ldlm_mode_t           l_req_mode;
         ldlm_mode_t           l_granted_mode;
@@ -125,7 +126,7 @@ struct ldlm_lock {
         ldlm_completion_callback    l_completion_ast;
         ldlm_blocking_callback    l_blocking_ast;
 
-        struct ptlrpc_connection *l_connection;
+        struct obd_export    *l_export;
         struct ptlrpc_client *l_client;
         struct lustre_handle *l_connh;
         __u32                 l_flags;