LU-3105 osd: remove capa related stuff from servers

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

diff --git a/lustre/osp/osp_internal.h b/lustre/osp/osp_internal.h
index b8beb98..243d3ca 100644 (file)
--- a/lustre/osp/osp_internal.h
+++ b/lustre/osp/osp_internal.h
@@ -48,6 +48,7 @@
 #include <lustre_fid.h>
 #include <lustre_update.h>
 #include <lu_target.h>
+#include <lustre_mdc.h>
 
 /*
  * Infrastructure to support tracking of last committed llog record
@@ -263,7 +264,7 @@ struct osp_thread_info {
        struct lu_attr           osi_attr;
        struct ost_id            osi_oi;
        struct ost_id            osi_oi2;
-       obd_id                   osi_id;
+       u64                      osi_id;
        loff_t                   osi_off;
        union {
                struct llog_rec_hdr             osi_hdr;
@@ -305,17 +306,19 @@ static inline bool is_only_remote_trans(struct thandle *th)
 static inline void osp_objid_buf_prep(struct lu_buf *buf, loff_t *off,
                                      __u32 *id, int index)
 {
+       /* Note: through id is only 32 bits, it will also write 64 bits
+        * for oid to keep compatibility with the previous version. */
        buf->lb_buf = (void *)id;
-       buf->lb_len = sizeof(obd_id);
-       *off = sizeof(obd_id) * index;
+       buf->lb_len = sizeof(u64);
+       *off = sizeof(u64) * index;
 }
 
 static inline void osp_objseq_buf_prep(struct lu_buf *buf, loff_t *off,
                                       __u64 *seq, int index)
 {
        buf->lb_buf = (void *)seq;
-       buf->lb_len = sizeof(obd_id);
-       *off = sizeof(obd_id) * index;
+       buf->lb_len = sizeof(u64);
+       *off = sizeof(u64) * index;
 }
 
 static inline void osp_buf_prep(struct lu_buf *lb, void *buf, int buf_len)
@@ -411,8 +414,20 @@ static inline struct seq_server_site *osp_seq_site(struct osp_device *osp)
 }
 
 #define osp_init_rpc_lock(lck) mdc_init_rpc_lock(lck)
-#define osp_get_rpc_lock(lck, it)  mdc_get_rpc_lock(lck, it)
-#define osp_put_rpc_lock(lck, it) mdc_put_rpc_lock(lck, it)
+
+static inline void osp_get_rpc_lock(struct osp_device *osp)
+{
+       struct mdc_rpc_lock *rpc_lock = osp->opd_obd->u.cli.cl_rpc_lock;
+
+       mdc_get_rpc_lock(rpc_lock, NULL);
+}
+
+static inline void osp_put_rpc_lock(struct osp_device *osp)
+{
+       struct mdc_rpc_lock *rpc_lock = osp->opd_obd->u.cli.cl_rpc_lock;
+
+       mdc_put_rpc_lock(rpc_lock, NULL);
+}
 
 static inline int osp_fid_diff(const struct lu_fid *fid1,
                               const struct lu_fid *fid2)
@@ -504,7 +519,7 @@ typedef int (*osp_async_request_interpreter_t)(const struct lu_env *env,
                                               void *data, int index, int rc);
 
 /* osp_dev.c */
-void osp_update_last_id(struct osp_device *d, obd_id objid);
+void osp_update_last_id(struct osp_device *d, u64 objid);
 extern struct llog_operations osp_mds_ost_orig_logops;
 
 /* osp_trans.c */
@@ -519,24 +534,27 @@ struct thandle *osp_trans_create(const struct lu_env *env,
                                 struct dt_device *d);
 int osp_trans_start(const struct lu_env *env, struct dt_device *dt,
                    struct thandle *th);
-
+int osp_prep_update_req(const struct lu_env *env, struct obd_import *imp,
+                       const struct object_update_request *ureq,
+                       struct ptlrpc_request **reqp);
+int osp_remote_sync(const struct lu_env *env, struct osp_device *osp,
+                   struct dt_update_request *update,
+                   struct ptlrpc_request **reqp, bool rpc_lock);
 /* osp_object.c */
 int osp_attr_get(const struct lu_env *env, struct dt_object *dt,
-                struct lu_attr *attr, struct lustre_capa *capa);
+                struct lu_attr *attr);
 int osp_xattr_get(const struct lu_env *env, struct dt_object *dt,
-                 struct lu_buf *buf, const char *name,
-                 struct lustre_capa *capa);
+                 struct lu_buf *buf, const char *name);
 int osp_declare_xattr_set(const struct lu_env *env, struct dt_object *dt,
                          const struct lu_buf *buf, const char *name,
                          int flag, struct thandle *th);
 int osp_xattr_set(const struct lu_env *env, struct dt_object *dt,
                  const struct lu_buf *buf, const char *name, int fl,
-                 struct thandle *th, struct lustre_capa *capa);
+                 struct thandle *th);
 int osp_declare_xattr_del(const struct lu_env *env, struct dt_object *dt,
                          const char *name, struct thandle *th);
 int osp_xattr_del(const struct lu_env *env, struct dt_object *dt,
-                 const char *name, struct thandle *th,
-                 struct lustre_capa *capa);
+                 const char *name, struct thandle *th);
 
 int osp_declare_object_destroy(const struct lu_env *env,
                               struct dt_object *dt, struct thandle *th);
@@ -547,7 +565,7 @@ int osp_trans_stop(const struct lu_env *env, struct dt_device *dt,
                   struct thandle *th);
 
 struct dt_it *osp_it_init(const struct lu_env *env, struct dt_object *dt,
-                         __u32 attr, struct lustre_capa *capa);
+                         __u32 attr);
 void osp_it_fini(const struct lu_env *env, struct dt_it *di);
 int osp_it_get(const struct lu_env *env, struct dt_it *di,
               const struct dt_key *key);