Replace all of the "char[37]" uses with obd_uuid_t.

[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 cd18fa2..7404dda 100644 (file)
--- a/lustre/include/linux/lustre_dlm.h
+++ b/lustre/include/linux/lustre_dlm.h
@@ -8,8 +8,12 @@
 #ifdef __KERNEL__
 
 #include <linux/proc_fs.h>
-#include <linux/obd_class.h>
+#include <linux/lustre_lib.h>
 #include <linux/lustre_net.h>
+#include <linux/lustre_import.h>
+
+struct obd_ops;
+struct obd_device;
 
 #define OBD_LDLM_DEVICENAME  "ldlm"
 
@@ -18,7 +22,6 @@ typedef enum {
 
         ELDLM_LOCK_CHANGED = 300,
         ELDLM_LOCK_ABORTED = 301,
-        ELDLM_RESOURCE_FREED = 302,
 
         ELDLM_NAMESPACE_EXISTS = 400,
         ELDLM_BAD_NAMESPACE    = 401
@@ -82,7 +85,6 @@ static inline int lockmode_compat(ldlm_mode_t exist, ldlm_mode_t new)
 
 struct ldlm_namespace {
         char                  *ns_name;
-        struct ptlrpc_client   ns_rpc_client;/* used for revocation callbacks */
         __u32                  ns_client; /* is this a client-side lock tree? */
         struct list_head      *ns_hash; /* hash table for ns */
         __u32                  ns_refcount; /* count of resources in the hash */
@@ -90,6 +92,10 @@ struct ldlm_namespace {
         struct lustre_lock     ns_lock; /* protects hash, refcount, list */
         struct list_head       ns_list_chain; /* position in global NS list */
         struct proc_dir_entry *ns_proc_dir;
+
+        spinlock_t             ns_counter_lock;
+        __u64                  ns_locks;
+        __u64                  ns_resources;
 };
 
 /* 
@@ -118,9 +124,8 @@ struct ldlm_lock {
         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 */
         struct list_head      l_export_chain; /* per-export chain of locks */
-        struct list_head      l_pending_chain; /* locks with callbacks pending */
+        struct list_head      l_pending_chain; /* locks with callbacks pending*/
         unsigned long         l_callback_timeout;
 
         ldlm_mode_t           l_req_mode;
@@ -130,10 +135,9 @@ struct ldlm_lock {
         ldlm_blocking_callback    l_blocking_ast;
 
         struct obd_export    *l_export;
-        struct ptlrpc_client *l_client;
         struct lustre_handle *l_connh;
         __u32                 l_flags;
-        struct lustre_handle    l_remote_handle;
+        struct lustre_handle   l_remote_handle;
         void                 *l_data;
         __u32                 l_data_len;
         void                 *l_cookie;
@@ -193,6 +197,12 @@ struct ldlm_ast_work {
         void *w_data;
         int w_datalen;
 };
+
+/* Per-export ldlm state. */
+struct ldlm_export_data {
+        struct list_head        led_held_locks;
+        struct obd_import       led_import;
+};
         
 static inline struct ldlm_extent *ldlm_res2extent(struct ldlm_resource *res)
 {
@@ -201,7 +211,6 @@ static inline struct ldlm_extent *ldlm_res2extent(struct ldlm_resource *res)
 
 extern struct obd_ops ldlm_obd_ops;
 
-
 extern char *ldlm_lockname[];
 extern char *ldlm_typename[];
 extern char *ldlm_it2str(int it);
@@ -211,7 +220,7 @@ do {                                                                    \
         if (lock->l_resource == NULL)                                   \
                 CDEBUG(D_DLMTRACE, "### " format                        \
                        " (UNKNOWN: lock %p(rc=%d/%d,%d) mode %s/%s on " \
-                       "res \?\? (rc=\?\?) type \?\?\? remote %Lx)\n" , \
+                       "res \?\? (rc=\?\?) type \?\?\? remote "LPX64")\n" , \
                        ## a, lock, lock->l_refc, lock->l_readers,       \
                        lock->l_writers,                                 \
                        ldlm_lockname[lock->l_granted_mode],             \
@@ -220,7 +229,7 @@ do {                                                                    \
         else                                                            \
                 CDEBUG(D_DLMTRACE, "### " format                        \
                        " (%s: lock %p(rc=%d/%d,%d) mode %s/%s on res "  \
-                       "%Lu (rc=%d) type %s remote %Lx)\n" , ## a,      \
+                       LPU64" (rc=%d) type %s remote "LPX64")\n" , ## a,      \
                        lock->l_resource->lr_namespace->ns_name, lock,   \
                        lock->l_refc, lock->l_readers, lock->l_writers,  \
                        ldlm_lockname[lock->l_granted_mode],             \
@@ -264,6 +273,7 @@ do {                                            \
         lock;                                   \
 })
 
+struct ldlm_lock *ldlm_lock_get(struct ldlm_lock *lock);
 void ldlm_lock_put(struct ldlm_lock *lock);
 void ldlm_lock_destroy(struct ldlm_lock *lock);
 void ldlm_lock2desc(struct ldlm_lock *lock, struct ldlm_lock_desc *desc);
@@ -293,7 +303,10 @@ void ldlm_lock_dump(struct ldlm_lock *lock);
 /* ldlm_test.c */
 int ldlm_test(struct obd_device *device, struct lustre_handle *connh);
 int ldlm_regression_start(struct obd_device *obddev, 
-                struct lustre_handle *connh, int count);
+                          struct lustre_handle *connh, 
+                          unsigned int threads, unsigned int max_locks_in, 
+                          unsigned int num_resources_in, 
+                          unsigned int num_extents_in);
 int ldlm_regression_stop(void);
 
 
@@ -352,6 +365,7 @@ int ldlm_server_ast(struct lustre_handle *lockh, struct ldlm_lock_desc *new,
                     void *data, __u32 data_len);
 int ldlm_cli_convert(struct lustre_handle *, int new_mode, int *flags);
 int ldlm_cli_cancel(struct lustre_handle *lockh);
+int ldlm_cli_cancel_unused(struct ldlm_namespace *ns, __u64 *res_id);
 
 /* mds/handler.c */
 /* This has to be here because recurisve inclusion sucks. */