Whamcloud - gitweb
LU-731 ldlm: revise and export ldlm_lock_set_data
[fs/lustre-release.git] / lustre / include / lustre_dlm.h
index ce63a5b..1b04e4c 100644 (file)
@@ -28,6 +28,9 @@
 /*
  * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
+ *
+ * Copyright (c) 2010 Whamcloud, Inc
+ *
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -261,7 +264,7 @@ static inline int lockmode_compat(ldlm_mode_t exist_mode, ldlm_mode_t new_mode)
  *     led_lock
  *
  * lr_lock
- *     ns_unused_lock
+ *     ns_lock
  *
  * lr_lvb_sem
  *     lr_lock
@@ -330,10 +333,6 @@ struct ldlm_pool {
          */
         cfs_atomic_t           pl_cancel_rate;
         /**
-         * Grant speed (GR-CR) per T.
-         */
-        cfs_atomic_t           pl_grant_speed;
-        /**
          * Server lock volume. Protected by pl_lock.
          */
         __u64                  pl_server_lock_volume;
@@ -395,11 +394,41 @@ typedef enum {
 #define NS_DEFAULT_CONTENTION_SECONDS 2
 #define NS_DEFAULT_CONTENDED_LOCKS 32
 
+struct ldlm_ns_bucket {
+        /** refer back */
+        struct ldlm_namespace      *nsb_namespace;
+        /** estimated lock callback time */
+        struct adaptive_timeout     nsb_at_estimate;
+};
+
+enum {
+        /** ldlm namespace lock stats */
+        LDLM_NSS_LOCKS          = 0,
+        LDLM_NSS_LAST
+};
+
+typedef enum {
+        /** invalide type */
+        LDLM_NS_TYPE_UNKNOWN    = 0,
+        /** mdc namespace */
+        LDLM_NS_TYPE_MDC,
+        /** mds namespace */
+        LDLM_NS_TYPE_MDT,
+        /** osc namespace */
+        LDLM_NS_TYPE_OSC,
+        /** ost namespace */
+        LDLM_NS_TYPE_OST,
+        /** mgc namespace */
+        LDLM_NS_TYPE_MGC,
+        /** mgs namespace */
+        LDLM_NS_TYPE_MGT,
+} ldlm_ns_type_t;
+
 struct ldlm_namespace {
         /**
-         * Namespace name. Used for logging, etc.
+         * Backward link to obd, required for ldlm pool to store new SLV.
          */
-        char                  *ns_name;
+        struct obd_device     *ns_obd;
 
         /**
          * Is this a client-side lock tree?
@@ -407,31 +436,30 @@ struct ldlm_namespace {
         ldlm_side_t            ns_client;
 
         /**
-         * Namespce connect flags supported by server (may be changed via proc,
-         * lru resize may be disabled/enabled).
+         * resource hash
          */
-        __u64                  ns_connect_flags;
+        cfs_hash_t            *ns_rs_hash;
 
-         /**
-          * Client side orig connect flags supported by server.
-          */
-        __u64                  ns_orig_connect_flags;
+        /**
+         * serialize
+         */
+        cfs_spinlock_t         ns_lock;
 
         /**
-         * Hash table for namespace.
+         * big refcount (by bucket)
          */
-        cfs_list_t            *ns_hash;
-        cfs_spinlock_t         ns_hash_lock;
+        cfs_atomic_t           ns_bref;
 
-         /**
-          * Count of resources in the hash.
-          */
-        __u32                  ns_refcount;
+        /**
+         * Namespce connect flags supported by server (may be changed via proc,
+         * lru resize may be disabled/enabled).
+         */
+        __u64                  ns_connect_flags;
 
          /**
-          * All root resources in namespace.
+          * Client side orig connect flags supported by server.
           */
-        cfs_list_t             ns_root_list;
+        __u64                  ns_orig_connect_flags;
 
         /**
          * Position in global namespace list.
@@ -443,7 +471,6 @@ struct ldlm_namespace {
          */
         cfs_list_t             ns_unused_list;
         int                    ns_nr_unused;
-        cfs_spinlock_t         ns_unused_lock;
 
         unsigned int           ns_max_unused;
         unsigned int           ns_max_age;
@@ -458,8 +485,6 @@ struct ldlm_namespace {
          */
         cfs_time_t             ns_next_dump;
 
-        cfs_atomic_t           ns_locks;
-        __u64                  ns_resources;
         ldlm_res_policy        ns_policy;
         struct ldlm_valblock_ops *ns_lvbo;
         void                  *ns_lvbp;
@@ -485,14 +510,16 @@ struct ldlm_namespace {
         unsigned               ns_max_nolock_size;
 
         /**
-         * Backward link to obd, required for ldlm pool to store new SLV.
+         * Limit of parallel AST RPC count.
          */
-        struct obd_device     *ns_obd;
-
-        struct adaptive_timeout ns_at_estimate;/* estimated lock callback time*/
+        unsigned               ns_max_parallel_ast;
 
         /* callback to cancel locks before replaying it during recovery */
         ldlm_cancel_for_recovery ns_cancel_for_recovery;
+        /**
+         * ldlm lock stats
+         */
+        struct lprocfs_stats  *ns_stats;
 };
 
 static inline int ns_is_client(struct ldlm_namespace *ns)
@@ -528,16 +555,6 @@ static inline void ns_register_cancel(struct ldlm_namespace *ns,
         ns->ns_cancel_for_recovery = arg;
 }
 
-/*
- *
- * Resource hash table
- *
- */
-
-#define RES_HASH_BITS 12
-#define RES_HASH_SIZE (1UL << RES_HASH_BITS)
-#define RES_HASH_MASK (RES_HASH_SIZE - 1)
-
 struct ldlm_lock;
 
 typedef int (*ldlm_blocking_callback)(struct ldlm_lock *lock,
@@ -575,6 +592,28 @@ typedef enum {
                                * in the same RPC */
 } ldlm_cancel_flags_t;
 
+struct ldlm_flock {
+        __u64 start;
+        __u64 end;
+        __u64 owner;
+        __u64 blocking_owner;
+        void *blocking_export;
+        __u32 pid;
+};
+
+typedef union {
+        struct ldlm_extent l_extent;
+        struct ldlm_flock l_flock;
+        struct ldlm_inodebits l_inodebits;
+} ldlm_policy_data_t;
+
+void ldlm_convert_policy_to_wire(ldlm_type_t type,
+                                 const ldlm_policy_data_t *lpolicy,
+                                 ldlm_wire_policy_data_t *wpolicy);
+void ldlm_convert_policy_to_local(ldlm_type_t type,
+                                  const ldlm_wire_policy_data_t *wpolicy,
+                                  ldlm_policy_data_t *lpolicy);
+
 struct ldlm_lock {
         /**
          * Must be first in the structure.
@@ -752,12 +791,10 @@ struct ldlm_lock {
 };
 
 struct ldlm_resource {
-        struct ldlm_namespace *lr_namespace;
+        struct ldlm_ns_bucket *lr_ns_bucket;
 
         /* protected by ns_hash_lock */
-        cfs_list_t             lr_hash;
-        cfs_list_t             lr_childof;  /* part of ns_root_list if root res,
-                                             * part of lr_children if child */
+        cfs_hlist_node_t       lr_hash;
         cfs_spinlock_t         lr_lock;
 
         /* protected by lr_lock */
@@ -772,8 +809,10 @@ struct ldlm_resource {
         struct ldlm_interval_tree lr_itree[LCK_MODE_NUM];  /* interval trees*/
 
         /* Server-side-only lock value block elements */
+        /** to serialize lvbo_init */
         cfs_semaphore_t        lr_lvb_sem;
         __u32                  lr_lvb_len;
+        /** protect by lr_lock */
         void                  *lr_lvb_data;
 
         /* when the resource was considered as contended */
@@ -786,10 +825,16 @@ struct ldlm_resource {
         struct inode          *lr_lvb_inode;
 };
 
+static inline char *
+ldlm_ns_name(struct ldlm_namespace *ns)
+{
+        return ns->ns_rs_hash->hs_name;
+}
+
 static inline struct ldlm_namespace *
 ldlm_res_to_ns(struct ldlm_resource *res)
 {
-        return res->lr_namespace;
+        return res->lr_ns_bucket->nsb_namespace;
 }
 
 static inline struct ldlm_namespace *
@@ -801,13 +846,13 @@ ldlm_lock_to_ns(struct ldlm_lock *lock)
 static inline char *
 ldlm_lock_to_ns_name(struct ldlm_lock *lock)
 {
-        return ldlm_lock_to_ns(lock)->ns_name;
+        return ldlm_ns_name(ldlm_lock_to_ns(lock));
 }
 
 static inline struct adaptive_timeout *
 ldlm_lock_to_ns_at(struct ldlm_lock *lock)
 {
-        return &ldlm_lock_to_ns(lock)->ns_at_estimate;
+        return &lock->l_resource->lr_ns_bucket->nsb_at_estimate;
 }
 
 struct ldlm_ast_work {
@@ -898,10 +943,8 @@ typedef int (*ldlm_res_iterator_t)(struct ldlm_resource *, void *);
 
 int ldlm_resource_foreach(struct ldlm_resource *res, ldlm_iterator_t iter,
                           void *closure);
-int ldlm_namespace_foreach(struct ldlm_namespace *ns, ldlm_iterator_t iter,
-                           void *closure);
-int ldlm_namespace_foreach_res(struct ldlm_namespace *ns,
-                               ldlm_res_iterator_t iter, void *closure);
+void ldlm_namespace_foreach(struct ldlm_namespace *ns, ldlm_iterator_t iter,
+                            void *closure);
 
 int ldlm_replay_locks(struct obd_import *imp);
 int ldlm_resource_iterate(struct ldlm_namespace *, const struct ldlm_res_id *,
@@ -941,6 +984,7 @@ void ldlm_lock2handle(const struct ldlm_lock *lock,
 struct ldlm_lock *__ldlm_handle2lock(const struct lustre_handle *, int flags);
 void ldlm_cancel_callback(struct ldlm_lock *);
 int ldlm_lock_remove_from_lru(struct ldlm_lock *);
+int ldlm_lock_set_data(struct lustre_handle *, void *);
 
 static inline struct ldlm_lock *ldlm_handle2lock(const struct lustre_handle *h)
 {
@@ -1047,7 +1091,8 @@ void ldlm_unlink_lock_skiplist(struct ldlm_lock *req);
 /* resource.c */
 struct ldlm_namespace *
 ldlm_namespace_new(struct obd_device *obd, char *name,
-                   ldlm_side_t client, ldlm_appetite_t apt);
+                   ldlm_side_t client, ldlm_appetite_t apt,
+                   ldlm_ns_type_t ns_type);
 int ldlm_namespace_cleanup(struct ldlm_namespace *ns, int flags);
 void ldlm_namespace_free(struct ldlm_namespace *ns,
                          struct obd_import *imp, int force);
@@ -1055,10 +1100,8 @@ void ldlm_namespace_register(struct ldlm_namespace *ns, ldlm_side_t client);
 void ldlm_namespace_unregister(struct ldlm_namespace *ns, ldlm_side_t client);
 void ldlm_namespace_move_locked(struct ldlm_namespace *ns, ldlm_side_t client);
 struct ldlm_namespace *ldlm_namespace_first_locked(ldlm_side_t client);
-void ldlm_namespace_get_locked(struct ldlm_namespace *ns);
-void ldlm_namespace_put_locked(struct ldlm_namespace *ns, int wakeup);
 void ldlm_namespace_get(struct ldlm_namespace *ns);
-void ldlm_namespace_put(struct ldlm_namespace *ns, int wakeup);
+void ldlm_namespace_put(struct ldlm_namespace *ns);
 int ldlm_proc_setup(void);
 #ifdef LPROCFS
 void ldlm_proc_cleanup(void);