LU-6775 ldlm: reduce mem footprint of ldlm_resource

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

diff --git a/lustre/include/lustre_dlm.h b/lustre/include/lustre_dlm.h
index 6a2bc6a..4839506 100644 (file)
--- a/lustre/include/lustre_dlm.h
+++ b/lustre/include/lustre_dlm.h
@@ -920,6 +920,9 @@ struct ldlm_resource {
         */
        struct hlist_node       lr_hash;
 
+       /** Reference count for this resource */
+       atomic_t                lr_refcount;
+
        /** Spinlock to protect locks under this resource. */
        spinlock_t              lr_lock;
 
@@ -936,39 +939,41 @@ struct ldlm_resource {
        struct list_head        lr_waiting;
        /** @} */
 
-       /* XXX No longer needed? Remove ASAP */
-       ldlm_mode_t             lr_most_restr;
-
-       /** Type of locks this resource can hold. Only one type per resource. */
-       ldlm_type_t             lr_type; /* LDLM_{PLAIN,EXTENT,FLOCK,IBITS} */
-
        /** Resource name */
        struct ldlm_res_id      lr_name;
-       /** Reference count for this resource */
-       atomic_t                lr_refcount;
 
        /**
         * Interval trees (only for extent locks) for all modes of this resource
         */
-       struct ldlm_interval_tree lr_itree[LCK_MODE_NUM];
+       struct ldlm_interval_tree *lr_itree;
+
+       union {
+               /**
+                * When the resource was considered as contended,
+                * used only on server side. */
+               cfs_time_t      lr_contention_time;
+               /**
+                * Associated inode, used only on client side.
+                */
+               struct inode    *lr_lvb_inode;
+       };
+
+       /** Type of locks this resource can hold. Only one type per resource. */
+       ldlm_type_t             lr_type; /* LDLM_{PLAIN,EXTENT,FLOCK,IBITS} */
 
        /**
         * Server-side-only lock value block elements.
         * To serialize lvbo_init.
         */
-       struct mutex            lr_lvb_mutex;
        int                     lr_lvb_len;
-       /** is lvb initialized ? */
-       bool                    lr_lvb_initialized;
+       struct mutex            lr_lvb_mutex;
        /** protected by lr_lock */
        void                    *lr_lvb_data;
+       /** is lvb initialized ? */
+       bool                    lr_lvb_initialized;
 
-       /** When the resource was considered as contended. */
-       cfs_time_t              lr_contention_time;
        /** List of references to this resource. For debugging. */
        struct lu_ref           lr_reference;
-
-       struct inode            *lr_lvb_inode;
 };
 
 static inline bool ldlm_has_layout(struct ldlm_lock *lock)