LU-6142 lov: convert container_of0() calls.

[fs/lustre-release.git] / lustre / lov / lov_internal.h

diff --git a/lustre/lov/lov_internal.h b/lustre/lov/lov_internal.h
index 05bfc12..d7ca81f 100644 (file)
--- a/lustre/lov/lov_internal.h
+++ b/lustre/lov/lov_internal.h
@@ -75,9 +75,14 @@ struct lov_stripe_md {
        spinlock_t      lsm_lock;
        pid_t           lsm_lock_owner; /* debugging */
 
-       /* maximum possible file size, might change as OSTs status changes,
-        * e.g. disconnected, deactivated */
-       loff_t          lsm_maxbytes;
+       union {
+               /* maximum possible file size, might change as OSTs status
+                * changes, e.g. disconnected, deactivated
+                */
+               loff_t          lsm_maxbytes;
+               /* size of full foreign LOV */
+               size_t          lsm_foreign_size;
+       };
        struct ost_id   lsm_oi;
        u32             lsm_magic;
        u32             lsm_layout_gen;
@@ -88,6 +93,8 @@ struct lov_stripe_md {
        struct lov_stripe_md_entry *lsm_entries[];
 };
 
+#define lsm_foreign(lsm) (lsm->lsm_entries[0])
+
 static inline bool lsme_inited(const struct lov_stripe_md_entry *lsme)
 {
        return lsme->lsme_flags & LCME_FL_INIT;
@@ -113,6 +120,9 @@ static inline size_t lov_comp_md_size(const struct lov_stripe_md *lsm)
                return lov_mds_md_size(lsm->lsm_entries[0]->lsme_stripe_count,
                                       lsm->lsm_entries[0]->lsme_magic);
 
+       if (lsm->lsm_magic == LOV_MAGIC_FOREIGN)
+               return lsm->lsm_foreign_size;
+
        LASSERT(lsm->lsm_magic == LOV_MAGIC_COMP_V1);
 
        size = sizeof(struct lov_comp_md_v1);
@@ -127,7 +137,7 @@ static inline size_t lov_comp_md_size(const struct lov_stripe_md *lsm)
                        stripe_count = 0;
 
                size += sizeof(*lsme);
-               size += lov_mds_md_size(lsme->lsme_stripe_count,
+               size += lov_mds_md_size(stripe_count,
                                        lsme->lsme_magic);
        }
 
@@ -164,6 +174,7 @@ struct lsm_operations {
 extern const struct lsm_operations lsm_v1_ops;
 extern const struct lsm_operations lsm_v3_ops;
 extern const struct lsm_operations lsm_comp_md_v1_ops;
+extern const struct lsm_operations lsm_foreign_ops;
 static inline const struct lsm_operations *lsm_op_find(int magic)
 {
        switch (magic) {
@@ -173,6 +184,8 @@ static inline const struct lsm_operations *lsm_op_find(int magic)
                return &lsm_v3_ops;
        case LOV_MAGIC_COMP_V1:
                return &lsm_comp_md_v1_ops;
+       case LOV_MAGIC_FOREIGN:
+               return &lsm_foreign_ops;
        default:
                CERROR("unrecognized lsm_magic %08x\n", magic);
                return NULL;
@@ -221,14 +234,18 @@ void lsm_free(struct lov_stripe_md *lsm);
 
 struct pool_desc {
        char                     pool_name[LOV_MAXPOOLNAME + 1];
-       struct ost_pool          pool_obds;
+       struct lu_tgt_pool       pool_obds;
        atomic_t                 pool_refcount;
-       struct hlist_node        pool_hash;     /* access by poolname */
+       struct rhash_head        pool_hash;     /* access by poolname */
        struct list_head         pool_list;     /* serial access */
+       struct rcu_head          pool_rcu;
        struct proc_dir_entry   *pool_proc_entry;
        struct obd_device       *pool_lobd;     /* owner */
 };
 
+int lov_pool_hash_init(struct rhashtable *tbl);
+void lov_pool_hash_destroy(struct rhashtable *tbl);
+
 struct lov_request {
        struct obd_info          rq_oi;
        struct lov_request_set  *rq_rqset;
@@ -318,14 +335,12 @@ extern struct lu_device_type lov_device_type;
 
 #define LOV_MDC_TGT_MAX 256
 
-/* pools */
-extern struct cfs_hash_ops pool_hash_operations;
-/* ost_pool methods */
-int lov_ost_pool_init(struct ost_pool *op, unsigned int count);
-int lov_ost_pool_extend(struct ost_pool *op, unsigned int min_count);
-int lov_ost_pool_add(struct ost_pool *op, __u32 idx, unsigned int min_count);
-int lov_ost_pool_remove(struct ost_pool *op, __u32 idx);
-int lov_ost_pool_free(struct ost_pool *op);
+/* lu_tgt_pool methods */
+int lov_ost_pool_init(struct lu_tgt_pool *op, unsigned int count);
+int lov_ost_pool_extend(struct lu_tgt_pool *op, unsigned int min_count);
+int lov_ost_pool_add(struct lu_tgt_pool *op, __u32 idx, unsigned int min_count);
+int lov_ost_pool_remove(struct lu_tgt_pool *op, __u32 idx);
+int lov_ost_pool_free(struct lu_tgt_pool *op);
 
 /* high level pool methods */
 int lov_pool_new(struct obd_device *obd, char *poolname);
@@ -354,7 +369,7 @@ static inline bool lov_oinfo_is_dummy(const struct lov_oinfo *loi)
 
 static inline struct obd_device *lov2obd(const struct lov_obd *lov)
 {
-       return container_of0(lov, struct obd_device, u.lov);
+       return container_of_safe(lov, struct obd_device, u.lov);
 }
 
 static inline void lov_lsm2layout(struct lov_stripe_md *lsm,