LU-1346 libcfs: cleanup libcfs primitive (linux-prim.h)

[fs/lustre-release.git] / lustre / osp / osp_internal.h

diff --git a/lustre/osp/osp_internal.h b/lustre/osp/osp_internal.h
index ed3057f..799ef20 100644 (file)
--- a/lustre/osp/osp_internal.h
+++ b/lustre/osp/osp_internal.h
@@ -27,7 +27,7 @@
  * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2012, Intel Corporation.
+ * Copyright (c) 2012, 2013, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -44,6 +44,7 @@
 #include <obd.h>
 #include <obd_class.h>
 #include <dt_object.h>
+#include <md_object.h>
 #include <lustre_fid.h>
 
 /*
@@ -97,7 +98,7 @@ struct osp_device {
        int                              opd_got_disconnected;
        int                              opd_imp_connected;
        int                              opd_imp_active;
-       int                              opd_imp_seen_connected:1,
+       unsigned int                     opd_imp_seen_connected:1,
                                         opd_connect_mdt:1;
 
        /* whether local recovery is completed:
@@ -118,9 +119,9 @@ struct osp_device {
        /* dedicate precreate thread */
        struct ptlrpc_thread             opd_pre_thread;
        /* thread waits for signals about pool going empty */
-       cfs_waitq_t                      opd_pre_waitq;
+       wait_queue_head_t                opd_pre_waitq;
        /* consumers (who needs new ids) wait here */
-       cfs_waitq_t                      opd_pre_user_waitq;
+       wait_queue_head_t                opd_pre_user_waitq;
        /* current precreation status: working, failed, stopping? */
        int                              opd_pre_status;
        /* how many to precreate next time */
@@ -144,7 +145,7 @@ struct osp_device {
        int                              opd_syn_prev_done;
        /* found records */
        struct ptlrpc_thread             opd_syn_thread;
-       cfs_waitq_t                      opd_syn_waitq;
+       wait_queue_head_t                opd_syn_waitq;
        /* list of remotely committed rpc */
        cfs_list_t                       opd_syn_committed_there;
        /* number of changes being under sync */
@@ -172,7 +173,7 @@ struct osp_device {
         */
        struct obd_statfs                opd_statfs;
        cfs_time_t                       opd_statfs_fresh_till;
-       cfs_timer_t                      opd_statfs_timer;
+       struct timer_list                        opd_statfs_timer;
        int                              opd_statfs_update_in_progress;
        /* how often to update statfs data */
        int                              opd_statfs_maxage;
@@ -180,13 +181,13 @@ struct osp_device {
        cfs_proc_dir_entry_t            *opd_symlink;
 };
 
-extern cfs_mem_cache_t *osp_object_kmem;
+extern struct kmem_cache *osp_object_kmem;
 
 /* this is a top object */
 struct osp_object {
        struct lu_object_header opo_header;
        struct dt_object        opo_obj;
-       int                     opo_reserved:1,
+       unsigned int            opo_reserved:1,
                                opo_new:1,
                                opo_empty:1;
 
@@ -198,7 +199,6 @@ struct osp_object {
 extern struct lu_object_operations osp_lu_obj_ops;
 extern const struct dt_device_operations osp_dt_ops;
 extern struct dt_object_operations osp_md_obj_ops;
-extern struct dt_lock_operations osp_md_lock_ops;
 
 struct osp_thread_info {
        struct lu_buf            osi_lb;
@@ -354,8 +354,8 @@ static int osp_fid_end_seq(const struct lu_env *env, struct lu_fid *fid)
                struct osp_thread_info *info = osp_env_info(env);
                struct ost_id *oi = &info->osi_oi;
 
-               fid_ostid_pack(fid, oi);
-               return oi->oi_id == IDIF_MAX_OID;
+               fid_to_ostid(fid, oi);
+               return ostid_id(oi) == IDIF_MAX_OID;
        } else {
                return fid_oid(fid) == LUSTRE_DATA_SEQ_MAX_WIDTH;
        }