X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Fosp%2Fosp_md_object.c;h=d84a259e24aefebc33723765281d8c8defe60702;hp=c3805f924ef551b305caa1426550dc47a762ee86;hb=de2d5808bd2987f76d2486272e1a9c192ba277d4;hpb=d51e4a48fd75bd9840bdf5d84701efb8d18fd669

diff --git a/lustre/osp/osp_md_object.c b/lustre/osp/osp_md_object.c
index c3805f9..d84a259 100644
--- a/lustre/osp/osp_md_object.c
+++ b/lustre/osp/osp_md_object.c
@@ -30,321 +30,30 @@
  * Author: Di Wang <di.wang@intel.com>
  */
 
-#ifndef EXPORT_SYMTAB
-# define EXPORT_SYMTAB
-#endif
 #define DEBUG_SUBSYSTEM S_MDS
 
 #include <lustre_log.h>
-#include <lustre_update.h>
 #include "osp_internal.h"
+
 static const char dot[] = ".";
 static const char dotdot[] = "..";
 
-static int osp_prep_update_req(const struct lu_env *env,
-			       struct osp_device *osp,
-			       struct update_buf *ubuf, int ubuf_len,
-			       struct ptlrpc_request **reqp)
-{
-	struct obd_import      *imp;
-	struct ptlrpc_request  *req;
-	struct update_buf      *tmp;
-	int			rc;
-	ENTRY;
-
-	imp = osp->opd_obd->u.cli.cl_import;
-	LASSERT(imp);
-
-	req = ptlrpc_request_alloc(imp, &RQF_UPDATE_OBJ);
-	if (req == NULL)
-		RETURN(-ENOMEM);
-
-	req_capsule_set_size(&req->rq_pill, &RMF_UPDATE, RCL_CLIENT,
-			     UPDATE_BUFFER_SIZE);
-
-	rc = ptlrpc_request_pack(req, LUSTRE_MDS_VERSION, UPDATE_OBJ);
-	if (rc != 0) {
-		ptlrpc_req_finished(req);
-		RETURN(rc);
-	}
-
-	req_capsule_set_size(&req->rq_pill, &RMF_UPDATE_REPLY, RCL_SERVER,
-			     UPDATE_BUFFER_SIZE);
-
-	tmp = req_capsule_client_get(&req->rq_pill, &RMF_UPDATE);
-	memcpy(tmp, ubuf, ubuf_len);
-
-	ptlrpc_request_set_replen(req);
-
-	*reqp = req;
-
-	RETURN(rc);
-}
-
-static int osp_remote_sync(const struct lu_env *env, struct dt_device *dt,
-			   struct update_request *update,
-			   struct ptlrpc_request **reqp)
-{
-	struct osp_device	*osp = dt2osp_dev(dt);
-	struct ptlrpc_request	*req = NULL;
-	int			rc;
-	ENTRY;
-
-	rc = osp_prep_update_req(env, osp, update->ur_buf, UPDATE_BUFFER_SIZE,
-				 &req);
-	if (rc)
-		RETURN(rc);
-
-	/* Note: some dt index api might return non-zero result here, like
-	 * osd_index_ea_lookup, so we should only check rc < 0 here */
-	rc = ptlrpc_queue_wait(req);
-	if (rc < 0) {
-		ptlrpc_req_finished(req);
-		update->ur_rc = rc;
-		RETURN(rc);
-	}
-
-	if (reqp != NULL) {
-		*reqp = req;
-		RETURN(rc);
-	}
-
-	update->ur_rc = rc;
-
-	ptlrpc_req_finished(req);
-
-	RETURN(rc);
-}
-
-/**
- * Create a new update request for the device.
- */
-static struct update_request
-*osp_create_update_req(struct dt_device *dt)
-{
-	struct update_request *update;
-
-	OBD_ALLOC_PTR(update);
-	if (!update)
-		return ERR_PTR(-ENOMEM);
-
-	OBD_ALLOC_LARGE(update->ur_buf, UPDATE_BUFFER_SIZE);
-	if (update->ur_buf == NULL) {
-		OBD_FREE_PTR(update);
-		return ERR_PTR(-ENOMEM);
-	}
-
-	CFS_INIT_LIST_HEAD(&update->ur_list);
-	update->ur_dt = dt;
-	update->ur_batchid = 0;
-	update->ur_buf->ub_magic = UPDATE_BUFFER_MAGIC;
-	update->ur_buf->ub_count = 0;
-
-	return update;
-}
-
-static void osp_destroy_update_req(struct update_request *update)
-{
-	if (update == NULL)
-		return;
-
-	cfs_list_del(&update->ur_list);
-	if (update->ur_buf != NULL)
-		OBD_FREE_LARGE(update->ur_buf, UPDATE_BUFFER_SIZE);
-
-	OBD_FREE_PTR(update);
-	return;
-}
-
-int osp_trans_stop(const struct lu_env *env, struct thandle *th)
-{
-	int rc = 0;
-
-	rc = th->th_current_request->ur_rc;
-	osp_destroy_update_req(th->th_current_request);
-	th->th_current_request = NULL;
-
-	return rc;
-}
-
-/**
- * In DNE phase I, all remote updates will be packed into RPC (the format
- * description is in lustre_idl.h) during declare phase, all of updates
- * are attached to the transaction, one entry per OSP. Then in trans start,
- * LOD will walk through these entries and send these UPDATEs to the remote
- * MDT to be executed synchronously.
- */
-int osp_trans_start(const struct lu_env *env, struct dt_device *dt,
-		    struct thandle *th)
-{
-	struct update_request *update;
-	int rc = 0;
-
-	/* In phase I, if the transaction includes remote updates, the local
-	 * update should be synchronized, so it will set th_sync = 1 */
-	update = th->th_current_request;
-	LASSERT(update != NULL && update->ur_dt == dt);
-	if (update->ur_buf->ub_count > 0) {
-		rc = osp_remote_sync(env, dt, update, NULL);
-		th->th_sync = 1;
-	}
-
-	RETURN(rc);
-}
-
-/**
- * Insert the update into the th_bufs for the device.
- */
-static int osp_insert_update(const struct lu_env *env,
-			     struct update_request *update, int op,
-			     struct lu_fid *fid, int count,
-			     int *lens, char **bufs)
-{
-	struct update_buf    *ubuf = update->ur_buf;
-	struct update        *obj_update;
-	char                 *ptr;
-	int                   i;
-	int                   update_length;
-	int                   rc = 0;
-	ENTRY;
-
-	obj_update = (struct update *)((char *)ubuf +
-		      cfs_size_round(update_buf_size(ubuf)));
-
-	/* Check update size to make sure it can fit into the buffer */
-	update_length = cfs_size_round(offsetof(struct update,
-				       u_bufs[0]));
-	for (i = 0; i < count; i++)
-		update_length += cfs_size_round(lens[i]);
-
-	if (cfs_size_round(update_buf_size(ubuf)) + update_length >
-	    UPDATE_BUFFER_SIZE || ubuf->ub_count >= UPDATE_MAX_OPS) {
-		CERROR("%s: insert up %p, idx %d cnt %d len %lu: rc = %d\n",
-			update->ur_dt->dd_lu_dev.ld_obd->obd_name, ubuf,
-			update_length, ubuf->ub_count, update_buf_size(ubuf),
-			-E2BIG);
-		RETURN(-E2BIG);
-	}
-
-	if (count > UPDATE_BUF_COUNT) {
-		CERROR("%s: Insert too much params %d "DFID" op %d: rc = %d\n",
-			update->ur_dt->dd_lu_dev.ld_obd->obd_name, count,
-			PFID(fid), op, -E2BIG);
-		RETURN(-E2BIG);
-	}
-
-	/* fill the update into the update buffer */
-	fid_cpu_to_le(&obj_update->u_fid, fid);
-	obj_update->u_type = cpu_to_le32(op);
-	obj_update->u_batchid = update->ur_batchid;
-	for (i = 0; i < count; i++)
-		obj_update->u_lens[i] = cpu_to_le32(lens[i]);
-
-	ptr = (char *)obj_update +
-			cfs_size_round(offsetof(struct update, u_bufs[0]));
-	for (i = 0; i < count; i++)
-		LOGL(bufs[i], lens[i], ptr);
-
-	ubuf->ub_count++;
-
-	CDEBUG(D_INFO, "%s: %p "DFID" idx %d: op %d params %d:%lu\n",
-	       update->ur_dt->dd_lu_dev.ld_obd->obd_name, ubuf, PFID(fid),
-	       ubuf->ub_count, op, count, update_buf_size(ubuf));
-
-	RETURN(rc);
-}
-
-static struct update_request
-*osp_find_update(struct thandle *th, struct dt_device *dt_dev)
-{
-	struct update_request   *update;
-
-	/* Because transaction api does not proivde the interface
-	 * to transfer the update from LOD to OSP,  we need walk
-	 * remote update list to find the update, this probably
-	 * should move to LOD layer, when update can be part of
-	 * the trancation api parameter. XXX */
-	cfs_list_for_each_entry(update, &th->th_remote_update_list, ur_list) {
-		if (update->ur_dt == dt_dev)
-			return update;
-	}
-	return NULL;
-}
-
-static inline void osp_md_add_update_batchid(struct update_request *update)
-{
-	update->ur_batchid++;
-}
-
-/**
- * Find one loc in th_dev/dev_obj_update for the update,
- * Because only one thread can access this thandle, no need
- * lock now.
- */
-static struct update_request
-*osp_find_create_update_loc(struct thandle *th, struct dt_object *dt)
-{
-	struct dt_device	*dt_dev = lu2dt_dev(dt->do_lu.lo_dev);
-	struct update_request	*update;
-	ENTRY;
-
-	update = osp_find_update(th, dt_dev);
-	if (update != NULL)
-		RETURN(update);
-
-	update = osp_create_update_req(dt_dev);
-	if (IS_ERR(update))
-		RETURN(update);
-
-	cfs_list_add_tail(&update->ur_list, &th->th_remote_update_list);
-
-	RETURN(update);
-}
-
-static int osp_get_attr_from_req(const struct lu_env *env,
-				 struct ptlrpc_request *req,
-				 struct lu_attr *attr, int index)
-{
-	struct update_reply	*reply;
-	struct obdo		*lobdo = &osp_env_info(env)->osi_obdo;
-	struct obdo		*wobdo;
-	int			size;
-
-	LASSERT(attr != NULL);
-
-	reply = req_capsule_server_sized_get(&req->rq_pill, &RMF_UPDATE_REPLY,
-					     UPDATE_BUFFER_SIZE);
-	if (reply->ur_version != UPDATE_REPLY_V1)
-		return -EPROTO;
-
-	size = update_get_reply_buf(reply, (void **)&wobdo, index);
-	if (size != sizeof(struct obdo))
-		return -EPROTO;
-
-	obdo_le_to_cpu(wobdo, wobdo);
-	lustre_get_wire_obdo(NULL, lobdo, wobdo);
-	la_from_obdo(attr, lobdo, lobdo->o_valid);
-
-	return 0;
-}
-
-static int osp_md_declare_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_declare_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)
 {
-	struct osp_thread_info	*osi = osp_env_info(env);
-	struct update_request	*update;
-	struct lu_fid		*fid1;
-	int			sizes[2] = {sizeof(struct obdo), 0};
-	char			*bufs[2] = {NULL, NULL};
-	int			buf_count;
-	int			rc;
-
+	struct osp_thread_info		*osi = osp_env_info(env);
+	struct dt_update_request	*update;
+	struct lu_fid			*fid1;
+	int				sizes[2] = {sizeof(struct obdo), 0};
+	char				*bufs[2] = {NULL, NULL};
+	int				buf_count;
+	int				rc;
 
-	update = osp_find_create_update_loc(th, dt);
+	update = out_find_create_update_loc(th, dt);
 	if (IS_ERR(update)) {
 		CERROR("%s: Get OSP update buf failed: rc = %d\n",
 		       dt->do_lu.lo_dev->ld_obd->obd_name,
@@ -353,22 +62,18 @@ static int osp_md_declare_object_create(const struct lu_env *env,
 	}
 
 	osi->osi_obdo.o_valid = 0;
-	LASSERT(S_ISDIR(attr->la_mode));
 	obdo_from_la(&osi->osi_obdo, attr, attr->la_valid);
 	lustre_set_wire_obdo(NULL, &osi->osi_obdo, &osi->osi_obdo);
-	obdo_cpu_to_le(&osi->osi_obdo, &osi->osi_obdo);
 
 	bufs[0] = (char *)&osi->osi_obdo;
 	buf_count = 1;
 	fid1 = (struct lu_fid *)lu_object_fid(&dt->do_lu);
-	if (hint->dah_parent) {
+	if (hint != NULL && hint->dah_parent) {
 		struct lu_fid *fid2;
-		struct lu_fid *tmp_fid = &osi->osi_fid;
 
 		fid2 = (struct lu_fid *)lu_object_fid(&hint->dah_parent->do_lu);
-		fid_cpu_to_le(tmp_fid, fid2);
-		sizes[1] = sizeof(*tmp_fid);
-		bufs[1] = (char *)tmp_fid;
+		sizes[1] = sizeof(*fid2);
+		bufs[1] = (char *)fid2;
 		buf_count++;
 	}
 
@@ -389,20 +94,20 @@ static int osp_md_declare_object_create(const struct lu_env *env,
 		CDEBUG(D_HA, "%s: object "DFID" exists, destroy this orphan\n",
 		       dt->do_lu.lo_dev->ld_obd->obd_name, PFID(fid1));
 
-		rc = osp_insert_update(env, update, OBJ_REF_DEL, fid1, 0,
+		rc = out_insert_update(env, update, OUT_REF_DEL, fid1, 0,
 				       NULL, NULL);
 		if (rc != 0)
 			GOTO(out, rc);
 
 		if (S_ISDIR(lu_object_attr(&dt->do_lu))) {
 			/* decrease for ".." */
-			rc = osp_insert_update(env, update, OBJ_REF_DEL, fid1,
+			rc = out_insert_update(env, update, OUT_REF_DEL, fid1,
 					       0, NULL, NULL);
 			if (rc != 0)
 				GOTO(out, rc);
 		}
 
-		rc = osp_insert_update(env, update, OBJ_DESTROY, fid1, 0, NULL,
+		rc = out_insert_update(env, update, OUT_DESTROY, fid1, 0, NULL,
 				       NULL);
 		if (rc != 0)
 			GOTO(out, rc);
@@ -410,11 +115,11 @@ static int osp_md_declare_object_create(const struct lu_env *env,
 		dt->do_lu.lo_header->loh_attr &= ~LOHA_EXISTS;
 		/* Increase batchid to add this orphan object deletion
 		 * to separate transaction */
-		osp_md_add_update_batchid(update);
+		update_inc_batchid(update);
 	}
 
-	rc = osp_insert_update(env, update, OBJ_CREATE, fid1, buf_count, sizes,
-			       bufs);
+	rc = out_insert_update(env, update, OUT_CREATE, fid1, buf_count, sizes,
+			       (const char **)bufs);
 out:
 	if (rc)
 		CERROR("%s: Insert update error: rc = %d\n",
@@ -423,14 +128,10 @@ out:
 	return rc;
 }
 
-static 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_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)
 {
-	struct osp_object  *obj = dt2osp_obj(dt);
-
 	CDEBUG(D_INFO, "create object "DFID"\n",
 	       PFID(&dt->do_lu.lo_header->loh_fid));
 
@@ -438,7 +139,6 @@ static int osp_md_object_create(const struct lu_env *env, struct dt_object *dt,
 	 * if creation reaches here, it means the object has been created
 	 * successfully */
 	dt->do_lu.lo_header->loh_attr |= LOHA_EXISTS | (attr->la_mode & S_IFMT);
-	obj->opo_empty = 1;
 
 	return 0;
 }
@@ -447,11 +147,11 @@ static int osp_md_declare_object_ref_del(const struct lu_env *env,
 					 struct dt_object *dt,
 					 struct thandle *th)
 {
-	struct update_request	*update;
-	struct lu_fid		*fid;
-	int			rc;
+	struct dt_update_request	*update;
+	struct lu_fid			*fid;
+	int				rc;
 
-	update = osp_find_create_update_loc(th, dt);
+	update = out_find_create_update_loc(th, dt);
 	if (IS_ERR(update)) {
 		CERROR("%s: Get OSP update buf failed: rc = %d\n",
 		       dt->do_lu.lo_dev->ld_obd->obd_name,
@@ -461,7 +161,7 @@ static int osp_md_declare_object_ref_del(const struct lu_env *env,
 
 	fid = (struct lu_fid *)lu_object_fid(&dt->do_lu);
 
-	rc = osp_insert_update(env, update, OBJ_REF_DEL, fid, 0, NULL, NULL);
+	rc = out_insert_update(env, update, OUT_REF_DEL, fid, 0, NULL, NULL);
 
 	return rc;
 }
@@ -479,11 +179,11 @@ static int osp_md_object_ref_del(const struct lu_env *env,
 static int osp_md_declare_ref_add(const struct lu_env *env,
 				  struct dt_object *dt, struct thandle *th)
 {
-	struct update_request	*update;
-	struct lu_fid		*fid;
-	int			rc;
+	struct dt_update_request	*update;
+	struct lu_fid			*fid;
+	int				rc;
 
-	update = osp_find_create_update_loc(th, dt);
+	update = out_find_create_update_loc(th, dt);
 	if (IS_ERR(update)) {
 		CERROR("%s: Get OSP update buf failed: rc = %d\n",
 		       dt->do_lu.lo_dev->ld_obd->obd_name,
@@ -493,7 +193,7 @@ static int osp_md_declare_ref_add(const struct lu_env *env,
 
 	fid = (struct lu_fid *)lu_object_fid(&dt->do_lu);
 
-	rc = osp_insert_update(env, update, OBJ_REF_ADD, fid, 0, NULL, NULL);
+	rc = out_insert_update(env, update, OUT_REF_ADD, fid, 0, NULL, NULL);
 
 	return rc;
 }
@@ -512,28 +212,25 @@ static void osp_md_ah_init(const struct lu_env *env,
 			   struct dt_allocation_hint *ah,
 			   struct dt_object *parent,
 			   struct dt_object *child,
-			   cfs_umode_t child_mode)
+			   umode_t child_mode)
 {
 	LASSERT(ah);
 
-	memset(ah, 0, sizeof(*ah));
 	ah->dah_parent = parent;
 	ah->dah_mode = child_mode;
 }
 
-static 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_declare_attr_set(const struct lu_env *env, struct dt_object *dt,
+			    const struct lu_attr *attr, struct thandle *th)
 {
-	struct osp_thread_info *osi = osp_env_info(env);
-	struct update_request  *update;
-	struct lu_fid          *fid;
-	int                     size = sizeof(struct obdo);
-	char                   *buf;
-	int                     rc;
-
-	update = osp_find_create_update_loc(th, dt);
+	struct osp_thread_info		*osi = osp_env_info(env);
+	struct dt_update_request	*update;
+	struct lu_fid			*fid;
+	int				size = sizeof(struct obdo);
+	char				*buf;
+	int				rc;
+
+	update = out_find_create_update_loc(th, dt);
 	if (IS_ERR(update)) {
 		CERROR("%s: Get OSP update buf failed: %d\n",
 		       dt->do_lu.lo_dev->ld_obd->obd_name,
@@ -542,23 +239,22 @@ static int osp_md_declare_attr_set(const struct lu_env *env,
 	}
 
 	osi->osi_obdo.o_valid = 0;
-	LASSERT(!(attr->la_valid & (LA_MODE | LA_TYPE)));
 	obdo_from_la(&osi->osi_obdo, (struct lu_attr *)attr,
 		     attr->la_valid);
 	lustre_set_wire_obdo(NULL, &osi->osi_obdo, &osi->osi_obdo);
-	obdo_cpu_to_le(&osi->osi_obdo, &osi->osi_obdo);
 
 	buf = (char *)&osi->osi_obdo;
 	fid = (struct lu_fid *)lu_object_fid(&dt->do_lu);
 
-	rc = osp_insert_update(env, update, OBJ_ATTR_SET, fid, 1, &size, &buf);
+	rc = out_insert_update(env, update, OUT_ATTR_SET, fid, 1, &size,
+			       (const char **)&buf);
 
 	return rc;
 }
 
-static int osp_md_attr_set(const struct lu_env *env, struct dt_object *dt,
-			   const struct lu_attr *attr, struct thandle *th,
-			   struct lustre_capa *capa)
+int osp_md_attr_set(const struct lu_env *env, struct dt_object *dt,
+		    const struct lu_attr *attr, struct thandle *th,
+		    struct lustre_capa *capa)
 {
 	CDEBUG(D_INFO, "attr set object "DFID"\n",
 	       PFID(&dt->do_lu.lo_header->loh_fid));
@@ -566,115 +262,6 @@ static int osp_md_attr_set(const struct lu_env *env, struct dt_object *dt,
 	RETURN(0);
 }
 
-static int osp_md_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)
-{
-	struct update_request	*update;
-	struct lu_fid		*fid;
-	int			sizes[3] = {strlen(name), buf->lb_len,
-					    sizeof(int)};
-	char			*bufs[3] = {(char *)name, (char *)buf->lb_buf };
-	int			rc;
-
-	LASSERT(buf->lb_len > 0 && buf->lb_buf != NULL);
-	update = osp_find_create_update_loc(th, dt);
-	if (IS_ERR(update)) {
-		CERROR("%s: Get OSP update buf failed: rc = %d\n",
-		       dt->do_lu.lo_dev->ld_obd->obd_name,
-		       (int)PTR_ERR(update));
-		return PTR_ERR(update);
-	}
-
-	flag = cpu_to_le32(flag);
-	bufs[2] = (char *)&flag;
-
-	fid = (struct lu_fid *)lu_object_fid(&dt->do_lu);
-	rc = osp_insert_update(env, update, OBJ_XATTR_SET, fid,
-			       ARRAY_SIZE(sizes), sizes, bufs);
-
-	return rc;
-}
-
-static int osp_md_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)
-{
-	CDEBUG(D_INFO, "xattr %s set object "DFID"\n", name,
-	       PFID(&dt->do_lu.lo_header->loh_fid));
-
-	return 0;
-}
-
-static int osp_md_xattr_get(const struct lu_env *env, struct dt_object *dt,
-			    struct lu_buf *buf, const char *name,
-			    struct lustre_capa *capa)
-{
-	struct dt_device	*dt_dev = lu2dt_dev(dt->do_lu.lo_dev);
-	struct update_request	*update = NULL;
-	struct ptlrpc_request	*req = NULL;
-	int			rc;
-	int			buf_len;
-	int			size;
-	struct update_reply	*reply;
-	void			*ea_buf;
-	ENTRY;
-
-	/* Because it needs send the update buffer right away,
-	 * just create an update buffer, instead of attaching the
-	 * update_remote list of the thandle.
-	 */
-	update = osp_create_update_req(dt_dev);
-	if (IS_ERR(update))
-		RETURN(PTR_ERR(update));
-
-	LASSERT(name != NULL);
-	buf_len = strlen(name);
-	rc = osp_insert_update(env, update, OBJ_XATTR_GET,
-			       (struct lu_fid *)lu_object_fid(&dt->do_lu),
-			       1, &buf_len, (char **)&name);
-	if (rc != 0) {
-		CERROR("%s: Insert update error: rc = %d\n",
-		       dt->do_lu.lo_dev->ld_obd->obd_name, rc);
-		GOTO(out, rc);
-	}
-	dt_dev = lu2dt_dev(dt->do_lu.lo_dev);
-
-	rc = osp_remote_sync(env, dt_dev, update, &req);
-	if (rc != 0)
-		GOTO(out, rc);
-
-	reply = req_capsule_server_sized_get(&req->rq_pill, &RMF_UPDATE_REPLY,
-					    UPDATE_BUFFER_SIZE);
-	if (reply->ur_version != UPDATE_REPLY_V1) {
-		CERROR("%s: Wrong version %x expected %x: rc = %d\n",
-		       dt_dev->dd_lu_dev.ld_obd->obd_name,
-		       reply->ur_version, UPDATE_REPLY_V1, -EPROTO);
-		GOTO(out, rc = -EPROTO);
-	}
-
-	size = update_get_reply_buf(reply, &ea_buf, 0);
-	if (size < 0)
-		GOTO(out, rc = size);
-
-	LASSERT(size > 0 && size < CFS_PAGE_SIZE);
-	LASSERT(ea_buf != NULL);
-
-	rc = size;
-	if (buf->lb_buf != NULL)
-		memcpy(buf->lb_buf, ea_buf, size);
-out:
-	if (req != NULL)
-		ptlrpc_req_finished(req);
-
-	if (update != NULL)
-		osp_destroy_update_req(update);
-
-	RETURN(rc);
-}
-
 static void osp_md_object_read_lock(const struct lu_env *env,
 				    struct dt_object *dt, unsigned role)
 {
@@ -727,87 +314,81 @@ static int osp_md_index_lookup(const struct lu_env *env, struct dt_object *dt,
 			       struct dt_rec *rec, const struct dt_key *key,
 			       struct lustre_capa *capa)
 {
-	struct dt_device	*dt_dev = lu2dt_dev(dt->do_lu.lo_dev);
-	struct update_request	*update;
-	struct ptlrpc_request	*req = NULL;
-	int			size = strlen((char *)key) + 1;
-	char			*name = (char *)key;
-	int			rc;
-	struct update_reply	*reply;
-	struct lu_fid		*fid;
-
+	struct lu_buf		*lbuf	= &osp_env_info(env)->osi_lb2;
+	struct osp_device	*osp	= lu2osp_dev(dt->do_lu.lo_dev);
+	struct dt_device	*dt_dev	= &osp->opd_dt_dev;
+	struct dt_update_request   *update;
+	struct object_update_reply *reply;
+	struct ptlrpc_request	   *req = NULL;
+	int			   size = strlen((char *)key) + 1;
+	struct lu_fid		   *fid;
+	int			   rc;
 	ENTRY;
 
 	/* Because it needs send the update buffer right away,
 	 * just create an update buffer, instead of attaching the
 	 * update_remote list of the thandle.
 	 */
-	update = osp_create_update_req(dt_dev);
+	update = out_create_update_req(dt_dev);
 	if (IS_ERR(update))
 		RETURN(PTR_ERR(update));
 
-	rc = osp_insert_update(env, update, OBJ_INDEX_LOOKUP,
-			       (struct lu_fid *)lu_object_fid(&dt->do_lu),
-			       1, &size, (char **)&name);
+	rc = out_insert_update(env, update, OUT_INDEX_LOOKUP,
+			       lu_object_fid(&dt->do_lu),
+			       1, &size, (const char **)&key);
 	if (rc) {
 		CERROR("%s: Insert update error: rc = %d\n",
 		       dt_dev->dd_lu_dev.ld_obd->obd_name, rc);
 		GOTO(out, rc);
 	}
 
-	rc = osp_remote_sync(env, dt_dev, update, &req);
-	if (rc < 0) {
-		CERROR("%s: lookup "DFID" %s failed: rc = %d\n",
-		       dt_dev->dd_lu_dev.ld_obd->obd_name,
-		       PFID(lu_object_fid(&dt->do_lu)), (char *)key, rc);
+	rc = out_remote_sync(env, osp->opd_obd->u.cli.cl_import, update, &req);
+	if (rc < 0)
 		GOTO(out, rc);
-	}
 
-	reply = req_capsule_server_sized_get(&req->rq_pill, &RMF_UPDATE_REPLY,
-					     UPDATE_BUFFER_SIZE);
-	if (reply->ur_version != UPDATE_REPLY_V1) {
+	reply = req_capsule_server_sized_get(&req->rq_pill,
+					     &RMF_OUT_UPDATE_REPLY,
+					     OUT_UPDATE_REPLY_SIZE);
+	if (reply->ourp_magic != UPDATE_REPLY_MAGIC) {
 		CERROR("%s: Wrong version %x expected %x: rc = %d\n",
 		       dt_dev->dd_lu_dev.ld_obd->obd_name,
-		       reply->ur_version, UPDATE_REPLY_V1, -EPROTO);
+		       reply->ourp_magic, UPDATE_REPLY_MAGIC, -EPROTO);
 		GOTO(out, rc = -EPROTO);
 	}
 
-	rc = update_get_reply_result(reply, NULL, 0);
-	if (rc < 0) {
-		CERROR("%s: wrong version lookup "DFID" %s: rc = %d\n",
-		       dt_dev->dd_lu_dev.ld_obd->obd_name,
-		       PFID(lu_object_fid(&dt->do_lu)), (char *)key, rc);
-		GOTO(out, rc);
-	}
-
-	size = update_get_reply_buf(reply, (void **)&fid, 0);
-	if (size < 0)
+	rc = object_update_result_data_get(reply, lbuf, 0);
+	if (rc < 0)
 		GOTO(out, rc = size);
 
-	if (size != sizeof(struct lu_fid)) {
-		CERROR("%s: lookup "DFID" %s wrong size %d: rc = %d\n",
+	if (lbuf->lb_len != sizeof(*fid)) {
+		CERROR("%s: lookup "DFID" %s wrong size %d\n",
 		       dt_dev->dd_lu_dev.ld_obd->obd_name,
-		       PFID(lu_object_fid(&dt->do_lu)), (char *)key, size, rc);
+		       PFID(lu_object_fid(&dt->do_lu)), (char *)key,
+		       (int)lbuf->lb_len);
 		GOTO(out, rc = -EINVAL);
 	}
 
-	fid_le_to_cpu(fid, fid);
+	fid = lbuf->lb_buf;
+	if (ptlrpc_rep_need_swab(req))
+		lustre_swab_lu_fid(fid);
 	if (!fid_is_sane(fid)) {
-		CERROR("%s: lookup "DFID" %s invalid fid "DFID": rc = %d\n",
+		CERROR("%s: lookup "DFID" %s invalid fid "DFID"\n",
 		       dt_dev->dd_lu_dev.ld_obd->obd_name,
-		       PFID(lu_object_fid(&dt->do_lu)), (char *)key, PFID(fid),
-		       rc);
+		       PFID(lu_object_fid(&dt->do_lu)), (char *)key, PFID(fid));
 		GOTO(out, rc = -EINVAL);
 	}
+
 	memcpy(rec, fid, sizeof(*fid));
+
+	GOTO(out, rc = 1);
+
 out:
 	if (req != NULL)
 		ptlrpc_req_finished(req);
 
-	if (update != NULL)
-		osp_destroy_update_req(update);
+	out_destroy_update_req(update);
 
-	RETURN(rc);
+	return rc;
 }
 
 static int osp_md_declare_insert(const struct lu_env *env,
@@ -816,15 +397,15 @@ static int osp_md_declare_insert(const struct lu_env *env,
 				 const struct dt_key *key,
 				 struct thandle *th)
 {
-	struct update_request	*update;
-	struct lu_fid		*fid;
-	struct lu_fid		*rec_fid = (struct lu_fid *)rec;
-	int			size[2] = {strlen((char *)key) + 1,
+	struct dt_update_request *update;
+	struct lu_fid		 *fid;
+	struct lu_fid		 *rec_fid = (struct lu_fid *)rec;
+	int			 size[2] = {strlen((char *)key) + 1,
 						  sizeof(*rec_fid)};
-	char			*bufs[2] = {(char *)key, (char *)rec_fid};
-	int			rc;
+	const char		 *bufs[2] = {(char *)key, (char *)rec_fid};
+	int			 rc;
 
-	update = osp_find_create_update_loc(th, dt);
+	update = out_find_create_update_loc(th, dt);
 	if (IS_ERR(update)) {
 		CERROR("%s: Get OSP update buf failed: rc = %d\n",
 		       dt->do_lu.lo_dev->ld_obd->obd_name,
@@ -840,7 +421,7 @@ static int osp_md_declare_insert(const struct lu_env *env,
 
 	fid_cpu_to_le(rec_fid, rec_fid);
 
-	rc = osp_insert_update(env, update, OBJ_INDEX_INSERT, fid,
+	rc = out_insert_update(env, update, OUT_INDEX_INSERT, fid,
 			       ARRAY_SIZE(size), size, bufs);
 	return rc;
 }
@@ -861,13 +442,12 @@ static int osp_md_declare_delete(const struct lu_env *env,
 				 const struct dt_key *key,
 				 struct thandle *th)
 {
-	struct update_request *update;
+	struct dt_update_request *update;
 	struct lu_fid *fid;
 	int size = strlen((char *)key) + 1;
-	char *buf = (char *)key;
 	int rc;
 
-	update = osp_find_create_update_loc(th, dt);
+	update = out_find_create_update_loc(th, dt);
 	if (IS_ERR(update)) {
 		CERROR("%s: Get OSP update buf failed: rc = %d\n",
 		       dt->do_lu.lo_dev->ld_obd->obd_name,
@@ -877,8 +457,8 @@ static int osp_md_declare_delete(const struct lu_env *env,
 
 	fid = (struct lu_fid *)lu_object_fid(&dt->do_lu);
 
-	rc = osp_insert_update(env, update, OBJ_INDEX_DELETE, fid, 1, &size,
-			       &buf);
+	rc = out_insert_update(env, update, OUT_INDEX_DELETE, fid, 1, &size,
+			       (const char **)&key);
 
 	return rc;
 }
@@ -895,94 +475,102 @@ static int osp_md_index_delete(const struct lu_env *env,
 	return 0;
 }
 
-/**
- * Creates or initializes iterator context.
- *
- * Note: for OSP, these index iterate api is only used to check
- * whether the directory is empty now (see mdd_dir_is_empty).
- * Since dir_empty will be return by OBJ_ATTR_GET(see osp_md_attr_get/
- * out_attr_get). So the implementation of these iterator is simplied
- * to make mdd_dir_is_empty happy. The real iterator should be
- * implemented, if we need it one day.
- */
-static struct dt_it *osp_it_init(const struct lu_env *env,
-				 struct dt_object *dt,
-				 __u32 attr,
-				struct lustre_capa *capa)
-{
-	lu_object_get(&dt->do_lu);
-	return (struct dt_it *)dt;
-}
-
-static void osp_it_fini(const struct lu_env *env, struct dt_it *di)
-{
-	struct dt_object *dt = (struct dt_object *)di;
-	lu_object_put(env, &dt->do_lu);
-}
-
-static int osp_it_get(const struct lu_env *env,
-		      struct dt_it *di, const struct dt_key *key)
-{
-	return 1;
-}
-
-static void osp_it_put(const struct lu_env *env, struct dt_it *di)
+int osp_md_index_it_next(const struct lu_env *env, struct dt_it *di)
 {
-	return;
-}
+	struct osp_it		*it = (struct osp_it *)di;
+	struct lu_idxpage	*idxpage;
+	struct lu_dirent	*ent = (struct lu_dirent *)it->ooi_ent;
+	int			rc;
+	ENTRY;
 
-static int osp_it_next(const struct lu_env *env, struct dt_it *di)
-{
-	struct dt_object *dt = (struct dt_object *)di;
-	struct osp_object *o = dt2osp_obj(dt);
+again:
+	idxpage = it->ooi_cur_idxpage;
+	if (idxpage != NULL) {
+		if (idxpage->lip_nr == 0)
+			RETURN(1);
+
+		it->ooi_pos_ent++;
+		if (ent == NULL) {
+			it->ooi_ent =
+			      (struct lu_dirent *)idxpage->lip_entries;
+			RETURN(0);
+		} else if (le16_to_cpu(ent->lde_reclen) != 0 &&
+			   it->ooi_pos_ent < idxpage->lip_nr) {
+			ent = (struct lu_dirent *)(((char *)ent) +
+					le16_to_cpu(ent->lde_reclen));
+			it->ooi_ent = ent;
+			RETURN(0);
+		} else {
+			it->ooi_ent = NULL;
+		}
+	}
 
-	if (o->opo_empty)
-		return 1;
+	rc = osp_it_next_page(env, di);
+	if (rc == 0)
+		goto again;
 
-	return 0;
+	RETURN(rc);
 }
 
 static struct dt_key *osp_it_key(const struct lu_env *env,
 				 const struct dt_it *di)
 {
-	LBUG();
-	return NULL;
+	struct osp_it		*it = (struct osp_it *)di;
+	struct lu_dirent	*ent = (struct lu_dirent *)it->ooi_ent;
+
+	return (struct dt_key *)ent->lde_name;
 }
 
 static int osp_it_key_size(const struct lu_env *env, const struct dt_it *di)
 {
-	LBUG();
-	return 0;
-}
+	struct osp_it		*it = (struct osp_it *)di;
+	struct lu_dirent	*ent = (struct lu_dirent *)it->ooi_ent;
 
-static int osp_it_rec(const struct lu_env *env, const struct dt_it *di,
-		      struct dt_rec *lde, __u32 attr)
-{
-	LBUG();
-	return 0;
+	return (int)le16_to_cpu(ent->lde_namelen);
 }
 
-static __u64 osp_it_store(const struct lu_env *env, const struct dt_it *di)
+static int osp_md_index_it_rec(const struct lu_env *env, const struct dt_it *di,
+			       struct dt_rec *rec, __u32 attr)
 {
-	LBUG();
+	struct osp_it		*it = (struct osp_it *)di;
+	struct lu_dirent	*ent = (struct lu_dirent *)it->ooi_ent;
+	int			reclen;
+
+	reclen = lu_dirent_calc_size(le16_to_cpu(ent->lde_namelen), attr);
+	memcpy(rec, ent, reclen);
 	return 0;
 }
 
+/**
+ * Locate the iteration cursor to the specified position (cookie).
+ *
+ * \param[in] env	pointer to the thread context
+ * \param[in] di	pointer to the iteration structure
+ * \param[in] hash	the specified position
+ *
+ * \retval		positive number for locating to the exactly position
+ *			or the next
+ * \retval		0 for arriving at the end of the iteration
+ * \retval		negative error number on failure
+ */
 static int osp_it_load(const struct lu_env *env, const struct dt_it *di,
 		       __u64 hash)
 {
-	LBUG();
-	return 0;
-}
+	struct osp_it	*it	= (struct osp_it *)di;
+	int		 rc;
 
-static int osp_it_key_rec(const struct lu_env *env, const struct dt_it *di,
-			  void *key_rec)
-{
-	LBUG();
-	return 0;
+	it->ooi_next = hash;
+	rc = osp_md_index_it_next(env, (struct dt_it *)di);
+	if (rc == 1)
+		return 0;
+
+	if (rc == 0)
+		return 1;
+
+	return rc;
 }
 
-static const struct dt_index_operations osp_md_index_ops = {
+const struct dt_index_operations osp_md_index_ops = {
 	.dio_lookup         = osp_md_index_lookup,
 	.dio_declare_insert = osp_md_declare_insert,
 	.dio_insert         = osp_md_index_insert,
@@ -993,10 +581,10 @@ static const struct dt_index_operations osp_md_index_ops = {
 		.fini     = osp_it_fini,
 		.get      = osp_it_get,
 		.put      = osp_it_put,
-		.next     = osp_it_next,
+		.next     = osp_md_index_it_next,
 		.key      = osp_it_key,
 		.key_size = osp_it_key_size,
-		.rec      = osp_it_rec,
+		.rec      = osp_md_index_it_rec,
 		.store    = osp_it_store,
 		.load     = osp_it_load,
 		.key_rec  = osp_it_key_rec,
@@ -1011,113 +599,26 @@ static int osp_md_index_try(const struct lu_env *env,
 	return 0;
 }
 
-static int osp_md_attr_get(const struct lu_env *env,
-			   struct dt_object *dt, struct lu_attr *attr,
-			   struct lustre_capa *capa)
-{
-	struct osp_object     *obj = dt2osp_obj(dt);
-	struct dt_device      *dt_dev = lu2dt_dev(dt->do_lu.lo_dev);
-	struct update_request *update = NULL;
-	struct ptlrpc_request *req = NULL;
-	int rc;
-	ENTRY;
-
-	/* Because it needs send the update buffer right away,
-	 * just create an update buffer, instead of attaching the
-	 * update_remote list of the thandle.
-	 */
-	update = osp_create_update_req(dt_dev);
-	if (IS_ERR(update))
-		RETURN(PTR_ERR(update));
-
-	rc = osp_insert_update(env, update, OBJ_ATTR_GET,
-			       (struct lu_fid *)lu_object_fid(&dt->do_lu),
-			       0, NULL, NULL);
-	if (rc) {
-		CERROR("%s: Insert update error: rc = %d\n",
-		       dt_dev->dd_lu_dev.ld_obd->obd_name, rc);
-		GOTO(out, rc);
-	}
-	dt_dev = lu2dt_dev(dt->do_lu.lo_dev);
-
-	rc = osp_remote_sync(env, dt_dev, update, &req);
-	if (rc < 0)
-		GOTO(out, rc);
-
-	rc = osp_get_attr_from_req(env, req, attr, 0);
-	if (rc)
-		GOTO(out, rc);
-
-	if (attr->la_flags == 1)
-		obj->opo_empty = 0;
-	else
-		obj->opo_empty = 1;
-out:
-	if (req != NULL)
-		ptlrpc_req_finished(req);
-
-	if (update != NULL)
-		osp_destroy_update_req(update);
-
-	RETURN(rc);
-}
-
-static int osp_md_declare_object_destroy(const struct lu_env *env,
-					 struct dt_object *dt,
-					 struct thandle *th)
-{
-	struct osp_object  *o = dt2osp_obj(dt);
-	int                 rc = 0;
-	ENTRY;
-
-	/*
-	 * track objects to be destroyed via llog
-	 */
-	rc = osp_sync_declare_add(env, o, MDS_UNLINK64_REC, th);
-
-	RETURN(rc);
-}
-
-static int osp_md_object_destroy(const struct lu_env *env,
-				 struct dt_object *dt, struct thandle *th)
-{
-	struct osp_object  *o = dt2osp_obj(dt);
-	int                 rc = 0;
-	ENTRY;
-
-	/*
-	 * once transaction is committed put proper command on
-	 * the queue going to our OST
-	 */
-	rc = osp_sync_add(env, o, MDS_UNLINK64_REC, th, NULL);
-
-	/* not needed in cache any more */
-	set_bit(LU_OBJECT_HEARD_BANSHEE, &dt->do_lu.lo_header->loh_flags);
-
-	RETURN(rc);
-}
-
 static int osp_md_object_lock(const struct lu_env *env,
 			      struct dt_object *dt,
 			      struct lustre_handle *lh,
 			      struct ldlm_enqueue_info *einfo,
-			      void *policy)
+			      ldlm_policy_data_t *policy)
 {
-	struct osp_thread_info *info = osp_env_info(env);
-	struct ldlm_res_id     *res_id = &info->osi_resid;
-	struct dt_device       *dt_dev = lu2dt_dev(dt->do_lu.lo_dev);
-	struct osp_device      *osp = dt2osp_dev(dt_dev);
-	struct ptlrpc_request  *req = NULL;
-	int                     rc = 0;
-	__u64                   flags = 0;
-	ldlm_mode_t             mode;
+	struct ldlm_res_id	*res_id;
+	struct dt_device	*dt_dev = lu2dt_dev(dt->do_lu.lo_dev);
+	struct osp_device	*osp = dt2osp_dev(dt_dev);
+	struct ptlrpc_request	*req;
+	int			rc = 0;
+	__u64			flags = 0;
+	ldlm_mode_t		mode;
 
-	fid_build_reg_res_name(lu_object_fid(&dt->do_lu), res_id);
+	res_id = einfo->ei_res_id;
+	LASSERT(res_id != NULL);
 
 	mode = ldlm_lock_match(osp->opd_obd->obd_namespace,
 			       LDLM_FL_BLOCK_GRANTED, res_id,
-			       einfo->ei_type,
-			       (ldlm_policy_data_t *)policy,
+			       einfo->ei_type, policy,
 			       einfo->ei_mode, lh, 0);
 	if (mode > 0)
 		return ELDLM_OK;
@@ -1135,6 +636,19 @@ static int osp_md_object_lock(const struct lu_env *env,
 	return rc == ELDLM_OK ? 0 : -EIO;
 }
 
+static int osp_md_object_unlock(const struct lu_env *env,
+				struct dt_object *dt,
+				struct ldlm_enqueue_info *einfo,
+				ldlm_policy_data_t *policy)
+{
+	struct lustre_handle	*lockh = einfo->ei_cbdata;
+
+	/* unlock finally */
+	ldlm_lock_decref(lockh, einfo->ei_mode);
+
+	return 0;
+}
+
 struct dt_object_operations osp_md_obj_ops = {
 	.do_read_lock         = osp_md_object_read_lock,
 	.do_write_lock        = osp_md_object_write_lock,
@@ -1147,15 +661,62 @@ struct dt_object_operations osp_md_obj_ops = {
 	.do_ref_add           = osp_md_object_ref_add,
 	.do_declare_ref_del   = osp_md_declare_object_ref_del,
 	.do_ref_del           = osp_md_object_ref_del,
-	.do_declare_destroy   = osp_md_declare_object_destroy,
-	.do_destroy           = osp_md_object_destroy,
+	.do_declare_destroy   = osp_declare_object_destroy,
+	.do_destroy           = osp_object_destroy,
 	.do_ah_init           = osp_md_ah_init,
-	.do_attr_get	      = osp_md_attr_get,
+	.do_attr_get	      = osp_attr_get,
 	.do_declare_attr_set  = osp_md_declare_attr_set,
 	.do_attr_set          = osp_md_attr_set,
-	.do_declare_xattr_set = osp_md_declare_xattr_set,
-	.do_xattr_set         = osp_md_xattr_set,
-	.do_xattr_get         = osp_md_xattr_get,
+	.do_xattr_get         = osp_xattr_get,
+	.do_declare_xattr_set = osp_declare_xattr_set,
+	.do_xattr_set         = osp_xattr_set,
+	.do_declare_xattr_del = osp_declare_xattr_del,
+	.do_xattr_del         = osp_xattr_del,
 	.do_index_try         = osp_md_index_try,
 	.do_object_lock       = osp_md_object_lock,
+	.do_object_unlock     = osp_md_object_unlock,
+};
+
+static ssize_t osp_md_declare_write(const struct lu_env *env,
+				    struct dt_object *dt,
+				    const struct lu_buf *buf,
+				    loff_t pos, struct thandle *th)
+{
+	struct dt_update_request  *update;
+	struct lu_fid		  *fid;
+	int			  sizes[2] = {buf->lb_len, sizeof(pos)};
+	const char		  *bufs[2] = {(char *)buf->lb_buf,
+					      (char *)&pos};
+	ssize_t			  rc;
+
+	update = out_find_create_update_loc(th, dt);
+	if (IS_ERR(update)) {
+		CERROR("%s: Get OSP update buf failed: rc = %d\n",
+		       dt->do_lu.lo_dev->ld_obd->obd_name,
+		       (int)PTR_ERR(update));
+		return PTR_ERR(update);
+	}
+
+	pos = cpu_to_le64(pos);
+	bufs[1] = (char *)&pos;
+	fid = (struct lu_fid *)lu_object_fid(&dt->do_lu);
+	rc = out_insert_update(env, update, OUT_WRITE, fid,
+			       ARRAY_SIZE(sizes), sizes, bufs);
+
+	return rc;
+
+}
+
+static ssize_t osp_md_write(const struct lu_env *env, struct dt_object *dt,
+			    const struct lu_buf *buf, loff_t *pos,
+			    struct thandle *handle,
+			    struct lustre_capa *capa, int ignore_quota)
+{
+	return buf->lb_len;
+}
+
+/* These body operation will be used to write symlinks during migration etc */
+struct dt_body_operations osp_md_body_ops = {
+	.dbo_declare_write	= osp_md_declare_write,
+	.dbo_write		= osp_md_write,
 };