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 2ba3de2..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>
 
 /*
@@ -68,6 +69,10 @@ struct osp_device {
        struct dt_device                 opd_dt_dev;
        /* corresponded OST index */
        int                              opd_index;
+
+       /* corrsponded MDT index, which will be used when connecting to OST
+        * for validating the connection (see ofd_parse_connect_data) */
+       int                              opd_group;
        /* device used to store persistent state (llogs, last ids) */
        struct obd_export               *opd_storage_exp;
        struct dt_device                *opd_storage;
@@ -93,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:
@@ -114,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 */
@@ -140,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 */
@@ -168,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;
@@ -176,18 +181,24 @@ 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,
-                                opo_new:1;
+       struct lu_object_header opo_header;
+       struct dt_object        opo_obj;
+       unsigned int            opo_reserved:1,
+                               opo_new:1,
+                               opo_empty:1;
+
+       /* read/write lock for md osp object */
+       struct rw_semaphore     opo_sem;
+       const struct lu_env     *opo_owner;
 };
 
 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;
 
 struct osp_thread_info {
        struct lu_buf            osi_lb;
@@ -207,6 +218,8 @@ struct osp_thread_info {
        struct llog_cookie       osi_cookie;
        struct llog_catid        osi_cid;
        struct lu_seq_range      osi_seq;
+       struct ldlm_res_id       osi_resid;
+       struct obdo              osi_obdo;
 };
 
 static inline void osp_objid_buf_prep(struct lu_buf *buf, loff_t *off,
@@ -335,6 +348,38 @@ static inline void osp_update_last_fid(struct osp_device *d, struct lu_fid *fid)
        }
 }
 
+static int osp_fid_end_seq(const struct lu_env *env, struct lu_fid *fid)
+{
+       if (fid_is_idif(fid)) {
+               struct osp_thread_info *info = osp_env_info(env);
+               struct ost_id *oi = &info->osi_oi;
+
+               fid_to_ostid(fid, oi);
+               return ostid_id(oi) == IDIF_MAX_OID;
+       } else {
+               return fid_oid(fid) == LUSTRE_DATA_SEQ_MAX_WIDTH;
+       }
+}
+
+static inline int osp_precreate_end_seq_nolock(const struct lu_env *env,
+                                              struct osp_device *osp)
+{
+       struct lu_fid *fid = &osp->opd_pre_last_created_fid;
+
+       return osp_fid_end_seq(env, fid);
+}
+
+static inline int osp_precreate_end_seq(const struct lu_env *env,
+                                       struct osp_device *osp)
+{
+       int rc;
+
+       spin_lock(&osp->opd_pre_lock);
+       rc = osp_precreate_end_seq_nolock(env, osp);
+       spin_unlock(&osp->opd_pre_lock);
+       return rc;
+}
+
 static inline int osp_is_fid_client(struct osp_device *osp)
 {
        struct obd_import *imp = osp->opd_obd->u.cli.cl_import;
@@ -346,6 +391,10 @@ static inline int osp_is_fid_client(struct osp_device *osp)
 void osp_update_last_id(struct osp_device *d, obd_id objid);
 extern struct llog_operations osp_mds_ost_orig_logops;
 
+/* osp_md_object.c */
+int osp_trans_start(const struct lu_env *env, struct dt_device *dt,
+                   struct thandle *th);
+int osp_trans_stop(const struct lu_env *env, struct thandle *th);
 /* osp_precreate.c */
 int osp_init_precreate(struct osp_device *d);
 int osp_precreate_reserve(const struct lu_env *env, struct osp_device *d);
@@ -374,10 +423,9 @@ int osp_sync_init(const struct lu_env *env, struct osp_device *d);
 int osp_sync_fini(struct osp_device *d);
 void __osp_sync_check_for_work(struct osp_device *d);
 
-/* osp_ost.c */
-int osp_init_for_ost(const struct lu_env *env, struct osp_device *m,
-                    struct lu_device_type *ldt, struct lustre_cfg *cfg);
-int osp_disconnect(struct osp_device *d);
-int osp_fini_for_ost(struct osp_device *osp);
+/* lwp_dev.c */
+void lprocfs_lwp_init_vars(struct lprocfs_static_vars *lvars);
+extern struct obd_ops lwp_obd_device_ops;
+extern struct lu_device_type lwp_device_type;
 
 #endif