LU-3963 obdclass: convert to linux list api

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

diff --git a/lustre/include/obd_class.h b/lustre/include/obd_class.h
index 962f789..f9ba3d8 100644 (file)
--- a/lustre/include/obd_class.h
+++ b/lustre/include/obd_class.h
@@ -73,6 +73,8 @@
 
 /* OBD Device Declarations */
 extern struct obd_device *obd_devs[MAX_OBD_DEVICES];
+extern struct list_head obd_types;
+extern spinlock_t obd_types_lock;
 extern rwlock_t obd_dev_lock;
 
 /* OBD Operations Declarations */
@@ -198,7 +200,7 @@ enum {
 struct config_llog_data {
         struct ldlm_res_id          cld_resid;
         struct config_llog_instance cld_cfg;
-        cfs_list_t                  cld_list_chain;
+       struct list_head            cld_list_chain;
        atomic_t                    cld_refcount;
        struct config_llog_data    *cld_sptlrpc;/* depended sptlrpc log */
        struct config_llog_data    *cld_params; /* common parameters log */
@@ -213,10 +215,10 @@ struct config_llog_data {
 };
 
 struct lustre_profile {
-        cfs_list_t       lp_list;
-        char            *lp_profile;
-        char            *lp_dt;
-        char            *lp_md;
+       struct list_head         lp_list;
+       char                    *lp_profile;
+       char                    *lp_dt;
+       char                    *lp_md;
 };
 
 struct lustre_profile *class_get_profile(const char * prof);
@@ -1631,17 +1633,18 @@ static inline int md_fsync(struct obd_export *exp, const struct lu_fid *fid,
        RETURN(rc);
 }
 
-static inline int md_read_entry(struct obd_export *exp,
-                               struct md_op_data *op_data,
-                               struct md_callback *cb_op,
-                               struct lu_dirent **ld,
-                               struct page **ppage)
+static inline int md_read_page(struct obd_export *exp,
+                              struct md_op_data *op_data,
+                              struct md_callback *cb_op,
+                              __u64  hash_offset,
+                              struct page **ppage)
 {
        int rc;
        ENTRY;
-       EXP_CHECK_MD_OP(exp, read_entry);
-       EXP_MD_COUNTER_INCREMENT(exp, read_entry);
-       rc = MDP(exp->exp_obd, read_entry)(exp, op_data, cb_op, ld, ppage);
+       EXP_CHECK_MD_OP(exp, read_page);
+       EXP_MD_COUNTER_INCREMENT(exp, read_page);
+       rc = MDP(exp->exp_obd, read_page)(exp, op_data, cb_op, hash_offset,
+                                         ppage);
        RETURN(rc);
 }
 
@@ -1897,7 +1900,7 @@ struct lwp_register_item {
        struct obd_export **lri_exp;
        register_lwp_cb     lri_cb_func;
        void               *lri_cb_data;
-       cfs_list_t          lri_list;
+       struct list_head            lri_list;
        char                lri_name[MTI_NAME_MAXLEN];
 };