LU-7042 lnet: Handle OFED 3.18 packaging definitions

[fs/lustre-release.git] / lustre / lod / lod_internal.h

diff --git a/lustre/lod/lod_internal.h b/lustre/lod/lod_internal.h
index ffbcd70..cd9f3a1 100644 (file)
--- a/lustre/lod/lod_internal.h
+++ b/lustre/lod/lod_internal.h
@@ -56,9 +56,10 @@
 #define LOV_OFFSET_DEFAULT             ((__u16)-1)
 
 struct lod_qos_rr {
+       spinlock_t               lqr_alloc;     /* protect allocation index */
        __u32                    lqr_start_idx; /* start index of new inode */
-       __u32                    lqr_offset_idx; /* aliasing for start_idx */
-       int                      lqr_start_count; /* reseed counter */
+       __u32                    lqr_offset_idx;/* aliasing for start_idx */
+       int                      lqr_start_count;/* reseed counter */
        struct ost_pool          lqr_pool;      /* round-robin optimized list */
        unsigned long            lqr_dirty:1;   /* recalc round-robin list */
 };
@@ -122,9 +123,11 @@ struct lod_tgt_desc {
        __u32              ltd_index;
        struct ltd_qos     ltd_qos; /* qos info per target */
        struct obd_statfs  ltd_statfs;
+       struct ptlrpc_thread    *ltd_recovery_thread;
        unsigned long      ltd_active:1,/* is this target up for requests */
                           ltd_activate:1,/* should  target be activated */
-                          ltd_reap:1;  /* should this target be deleted */
+                          ltd_reap:1,  /* should this target be deleted */
+                          ltd_got_update_log:1; /* Already got update log */
 };
 
 #define TGT_PTRS               256     /* number of pointers at 1st level */
@@ -169,7 +172,8 @@ struct lod_device {
        int                   lod_connects;
        unsigned int          lod_recovery_completed:1,
                              lod_initialized:1,
-                             lod_lmv_failout:1;
+                             lod_lmv_failout:1,
+                             lod_child_got_update_log:1;
 
        /* lov settings descriptor storing static information */
        struct lov_desc       lod_desc;
@@ -182,6 +186,9 @@ struct lod_device {
        /* Description of MDT */
        struct lod_tgt_descs  lod_mdt_descs;
 
+       /* Recovery thread for lod_child */
+       struct ptlrpc_thread    lod_child_recovery_thread;
+
        /* maximum EA size underlied OSD may have */
        unsigned int          lod_osd_max_easize;
 
@@ -194,7 +201,7 @@ struct lod_device {
        /* OST pool data */
        struct ost_pool         lod_pool_info; /* all OSTs in a packed array */
        int                     lod_pool_count;
-       cfs_hash_t             *lod_pools_hash_body; /* used for key access */
+       struct cfs_hash        *lod_pools_hash_body; /* used for key access */
        struct list_head        lod_pool_list; /* used for sequential access */
        struct proc_dir_entry  *lod_pool_proc_entry;
 
@@ -296,6 +303,8 @@ struct lod_thread_info {
        struct lu_name    lti_name;
        struct lu_buf     lti_linkea_buf;
        struct dt_insert_rec lti_dt_rec;
+       struct llog_catid lti_cid;
+       struct llog_cookie lti_cookie;
 };
 
 extern const struct lu_device_operations lod_lu_ops;
@@ -355,12 +364,6 @@ static inline struct dt_object* lod_object_child(struct lod_object *o)
                        struct dt_object, do_lu);
 }
 
-static inline struct dt_object *dt_object_child(struct dt_object *o)
-{
-       return container_of0(lu_object_next(&(o)->do_lu),
-                       struct dt_object, do_lu);
-}
-
 extern struct lu_context_key lod_thread_key;
 
 static inline struct lod_thread_info *lod_env_info(const struct lu_env *env)
@@ -386,10 +389,19 @@ lod_name_get(const struct lu_env *env, const void *area, int len)
        if ((__dev)->lod_osts_size > 0) \
                cfs_foreach_bit((__dev)->lod_ost_bitmap, (index))
 
+#define lod_foreach_mdt(mdt_dev, index)        \
+       cfs_foreach_bit((mdt_dev)->lod_mdt_bitmap, (index))
+
 /* lod_dev.c */
 extern struct kmem_cache *lod_object_kmem;
 int lod_fld_lookup(const struct lu_env *env, struct lod_device *lod,
                   const struct lu_fid *fid, __u32 *tgt, int *flags);
+int lod_sub_init_llog(const struct lu_env *env, struct lod_device *lod,
+                     struct dt_device *dt);
+void lod_sub_fini_llog(const struct lu_env *env,
+                      struct dt_device *dt, struct ptlrpc_thread *thread);
+int lodname2mdt_index(char *lodname, __u32 *mdt_index);
+
 /* lod_lov.c */
 void lod_getref(struct lod_tgt_descs *ltd);
 void lod_putref(struct lod_device *lod, struct lod_tgt_descs *ltd);
@@ -451,7 +463,7 @@ void lod_pool_putref(struct pool_desc *pool);
 int lod_ost_pool_free(struct ost_pool *op);
 int lod_pool_del(struct obd_device *obd, char *poolname);
 int lod_ost_pool_init(struct ost_pool *op, unsigned int count);
-extern cfs_hash_ops_t pool_hash_operations;
+extern struct cfs_hash_ops pool_hash_operations;
 int lod_check_index_in_pool(__u32 idx, struct pool_desc *pool);
 int lod_pool_new(struct obd_device *obd, char *poolname);
 int lod_pool_add(struct obd_device *obd, char *poolname, char *ostname);
@@ -463,6 +475,7 @@ int lod_qos_prep_create(const struct lu_env *env, struct lod_object *lo,
                        struct thandle *th);
 int qos_add_tgt(struct lod_device*, struct lod_tgt_desc *);
 int qos_del_tgt(struct lod_device *, struct lod_tgt_desc *);
+void lod_qos_rr_init(struct lod_qos_rr *lqr);
 
 /* lproc_lod.c */
 int lod_procfs_init(struct lod_device *lod);
@@ -565,4 +578,7 @@ int lod_sub_object_declare_punch(const struct lu_env *env,
                                 struct thandle *th);
 int lod_sub_object_punch(const struct lu_env *env, struct dt_object *dt,
                         __u64 start, __u64 end, struct thandle *th);
+
+int lod_sub_prep_llog(const struct lu_env *env, struct lod_device *lod,
+                     struct dt_device *dt, int index);
 #endif