LU-6245 libcfs: cleanup up libcfs hash code for upstream

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

diff --git a/lustre/lod/lod_internal.h b/lustre/lod/lod_internal.h
index 85c5007..6f1bff1 100644 (file)
--- a/lustre/lod/lod_internal.h
+++ b/lustre/lod/lod_internal.h
@@ -125,7 +125,8 @@ struct lod_tgt_desc {
        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 */
@@ -170,7 +171,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;
@@ -198,7 +200,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;
 
@@ -301,6 +303,7 @@ struct lod_thread_info {
        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;
@@ -360,12 +363,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)
@@ -465,7 +462,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);