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;
struct page **ooi_pages;
};
+struct osp_thandle {
+ struct thandle ot_super;
+ struct dt_update_request *ot_dur;
+
+ /* OSP will use this thandle to update last oid*/
+ struct thandle *ot_storage_th;
+};
+
+static inline struct osp_thandle *
+thandle_to_osp_thandle(struct thandle *th)
+{
+ return container_of(th, struct osp_thandle, ot_super);
+}
+
+static inline struct dt_update_request *
+thandle_to_dt_update_request(struct thandle *th)
+{
+ struct osp_thandle *oth;
+
+ oth = thandle_to_osp_thandle(th);
+ return oth->ot_dur;
+}
+
/* The transaction only include the updates on the remote node, and
* no local updates at all */
static inline bool is_only_remote_trans(struct thandle *th)
{
- return th->th_dev != NULL && th->th_dev->dd_ops == &osp_dt_ops;
+ return th->th_top == NULL;
}
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)
return imp->imp_connect_data.ocd_connect_flags & OBD_CONNECT_FID;
}
-typedef int (*osp_async_request_interpreter_t)(const struct lu_env *env,
- struct object_update_reply *rep,
- struct ptlrpc_request *req,
- struct osp_object *obj,
- void *data, int index, int rc);
+typedef int (*osp_update_interpreter_t)(const struct lu_env *env,
+ struct object_update_reply *rep,
+ struct ptlrpc_request *req,
+ struct osp_object *obj,
+ 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 */
int osp_insert_async_request(const struct lu_env *env, enum update_type op,
struct osp_object *obj, int count, __u16 *lens,
const void **bufs, void *data,
- osp_async_request_interpreter_t interpreter);
+ osp_update_interpreter_t interpreter);
+
int osp_unplug_async_request(const struct lu_env *env,
struct osp_device *osp,
struct dt_update_request *update);
+int osp_trans_update_request_create(struct thandle *th);
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_insert_update_callback(const struct lu_env *env,
+ struct dt_update_request *update,
+ struct osp_object *obj, void *data,
+ osp_update_interpreter_t interpreter);
+int osp_prep_update_req(const struct lu_env *env, struct obd_import *imp,
+ const struct object_update_request *ureq,
+ struct ptlrpc_request **reqp);
+struct dt_update_request *dt_update_request_create(struct dt_device *dt);
+void dt_update_request_destroy(struct dt_update_request *dt_update);
+
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);
+ struct ptlrpc_request **reqp);
+
+struct thandle *osp_get_storage_thandle(const struct lu_env *env,
+ struct thandle *th,
+ struct osp_device *osp);
/* 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);
-
-int osp_declare_object_destroy(const struct lu_env *env,
- struct dt_object *dt, struct thandle *th);
-int osp_object_destroy(const struct lu_env *env, struct dt_object *dt,
- struct thandle *th);
+ const char *name, struct thandle *th);
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);
int osp_md_object_create(const struct lu_env *env, struct dt_object *dt,
struct lu_attr *attr, struct dt_allocation_hint *hint,
struct dt_object_format *dof, struct thandle *th);
-int __osp_md_attr_set(const struct lu_env *env, struct dt_object *dt,
- const struct lu_attr *attr, struct thandle *th);
+int osp_md_declare_attr_set(const struct lu_env *env, struct dt_object *dt,
+ const struct lu_attr *attr, struct thandle *th);
+int osp_md_attr_set(const struct lu_env *env, struct dt_object *dt,
+ const struct lu_attr *attr, struct thandle *th);
extern const struct dt_index_operations osp_md_index_ops;
/* osp_precreate.c */
git://git.whamcloud.com / fs / lustre-release.git / blobdiff