X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Ftarget%2Fout_handler.c;h=b9c93220ee6438bcdbc607c6143307b861380176;hp=1d65bedddb875cefe689b5f6b882f5a8f9297e17;hb=c394068ee148595711c661651368b91373bcc78a;hpb=370de927fc58fd3910fc527a00b5ff96da4a4278

diff --git a/lustre/target/out_handler.c b/lustre/target/out_handler.c
index 1d65bed..b9c9322 100644
--- a/lustre/target/out_handler.c
+++ b/lustre/target/out_handler.c
@@ -22,7 +22,7 @@
 /*
  * Copyright (c) 2013, Intel Corporation.
  *
- * lustre/mdt/out_handler.c
+ * lustre/target/out_handler.c
  *
  * Object update handler between targets.
  *
@@ -36,128 +36,93 @@
 #include "tgt_internal.h"
 #include <lustre_update.h>
 
-struct tx_arg *tx_add_exec(struct thandle_exec_args *ta, tx_exec_func_t func,
-			   tx_exec_func_t undo, char *file, int line)
+static int tx_extend_args(struct thandle_exec_args *ta, int new_alloc_ta)
 {
-	int i;
-
-	LASSERT(ta);
-	LASSERT(func);
-
-	i = ta->ta_argno;
-	LASSERT(i < UPDATE_MAX_OPS);
-
-	ta->ta_argno++;
+	struct tx_arg	**new_ta;
+	int		i;
+	int		rc = 0;
 
-	ta->ta_args[i].exec_fn = func;
-	ta->ta_args[i].undo_fn = undo;
-	ta->ta_args[i].file    = file;
-	ta->ta_args[i].line    = line;
+	if (ta->ta_alloc_args >= new_alloc_ta)
+		return 0;
 
-	return &ta->ta_args[i];
-}
+	OBD_ALLOC(new_ta, sizeof(*new_ta) * new_alloc_ta);
+	if (new_ta == NULL)
+		return -ENOMEM;
 
-static int out_tx_start(const struct lu_env *env, struct dt_device *dt,
-			struct thandle_exec_args *ta, struct obd_export *exp)
-{
-	memset(ta, 0, sizeof(*ta));
-	ta->ta_handle = dt_trans_create(env, dt);
-	if (IS_ERR(ta->ta_handle)) {
-		CERROR("%s: start handle error: rc = %ld\n",
-		       dt_obd_name(dt), PTR_ERR(ta->ta_handle));
-		return PTR_ERR(ta->ta_handle);
+	for (i = 0; i < new_alloc_ta; i++) {
+		if (i < ta->ta_alloc_args) {
+			/* copy the old args to new one */
+			new_ta[i] = ta->ta_args[i];
+		} else {
+			OBD_ALLOC_PTR(new_ta[i]);
+			if (new_ta[i] == NULL)
+				GOTO(out, rc = -ENOMEM);
+		}
 	}
-	ta->ta_dev = dt;
-	if (exp->exp_need_sync)
-		ta->ta_handle->th_sync = 1;
 
-	return 0;
-}
+	/* free the old args */
+	if (ta->ta_args != NULL)
+		OBD_FREE(ta->ta_args, sizeof(ta->ta_args[0]) *
+				      ta->ta_alloc_args);
 
-static int out_trans_start(const struct lu_env *env,
-			   struct thandle_exec_args *ta)
-{
-	return dt_trans_start(env, ta->ta_dev, ta->ta_handle);
-}
-
-static int out_trans_stop(const struct lu_env *env,
-			  struct thandle_exec_args *ta, int err)
-{
-	int i;
-	int rc;
-
-	ta->ta_handle->th_result = err;
-	rc = dt_trans_stop(env, ta->ta_dev, ta->ta_handle);
-	for (i = 0; i < ta->ta_argno; i++) {
-		if (ta->ta_args[i].object != NULL) {
-			lu_object_put(env, &ta->ta_args[i].object->do_lu);
-			ta->ta_args[i].object = NULL;
+	ta->ta_args = new_ta;
+	ta->ta_alloc_args = new_alloc_ta;
+out:
+	if (rc != 0) {
+		for (i = 0; i < new_alloc_ta; i++) {
+			if (new_ta[i] != NULL)
+				OBD_FREE_PTR(new_ta[i]);
 		}
+		OBD_FREE(new_ta, sizeof(*new_ta) * new_alloc_ta);
 	}
-
 	return rc;
 }
 
-int out_tx_end(const struct lu_env *env, struct thandle_exec_args *ta)
+#define TX_ALLOC_STEP	8
+static struct tx_arg *tx_add_exec(struct thandle_exec_args *ta,
+				  tx_exec_func_t func, tx_exec_func_t undo,
+				  const char *file, int line)
 {
-	struct tgt_session_info *tsi = tgt_ses_info(env);
-	int i = 0, rc;
+	int rc;
+	int i;
 
-	LASSERT(ta->ta_dev);
-	LASSERT(ta->ta_handle);
+	LASSERT(ta != NULL);
+	LASSERT(func != NULL);
 
-	if (ta->ta_err != 0 || ta->ta_argno == 0)
-		GOTO(stop, rc = ta->ta_err);
+	if (ta->ta_argno + 1 >= ta->ta_alloc_args) {
+		rc = tx_extend_args(ta, ta->ta_alloc_args + TX_ALLOC_STEP);
+		if (rc != 0)
+			return ERR_PTR(rc);
+	}
 
-	rc = out_trans_start(env, ta);
-	if (unlikely(rc))
-		GOTO(stop, rc);
+	i = ta->ta_argno;
 
-	for (i = 0; i < ta->ta_argno; i++) {
-		rc = ta->ta_args[i].exec_fn(env, ta->ta_handle,
-					    &ta->ta_args[i]);
-		if (unlikely(rc)) {
-			CDEBUG(D_INFO, "error during execution of #%u from"
-			       " %s:%d: rc = %d\n", i, ta->ta_args[i].file,
-			       ta->ta_args[i].line, rc);
-			while (--i >= 0) {
-				LASSERTF(ta->ta_args[i].undo_fn != NULL,
-				    "can't undo changes, hope for failover!\n");
-				ta->ta_args[i].undo_fn(env, ta->ta_handle,
-						       &ta->ta_args[i]);
-			}
-			break;
-		}
-	}
+	ta->ta_argno++;
 
-	/* Only fail for real update */
-	tsi->tsi_reply_fail_id = OBD_FAIL_UPDATE_OBJ_NET_REP;
-stop:
-	CDEBUG(D_INFO, "%s: executed %u/%u: rc = %d\n",
-	       dt_obd_name(ta->ta_dev), i, ta->ta_argno, rc);
-	out_trans_stop(env, ta, rc);
-	ta->ta_handle = NULL;
-	ta->ta_argno = 0;
-	ta->ta_err = 0;
+	ta->ta_args[i]->exec_fn = func;
+	ta->ta_args[i]->undo_fn = undo;
+	ta->ta_args[i]->file    = file;
+	ta->ta_args[i]->line    = line;
 
-	RETURN(rc);
+	return ta->ta_args[i];
 }
 
 static void out_reconstruct(const struct lu_env *env, struct dt_device *dt,
-			    struct dt_object *obj, struct update_reply *reply,
+			    struct dt_object *obj,
+			    struct object_update_reply *reply,
 			    int index)
 {
 	CDEBUG(D_INFO, "%s: fork reply reply %p index %d: rc = %d\n",
 	       dt_obd_name(dt), reply, index, 0);
 
-	update_insert_reply(reply, NULL, 0, index, 0);
+	object_update_result_insert(reply, NULL, 0, index, 0);
 	return;
 }
 
 typedef void (*out_reconstruct_t)(const struct lu_env *env,
 				  struct dt_device *dt,
 				  struct dt_object *obj,
-				  struct update_reply *reply,
+				  struct object_update_reply *reply,
 				  int index);
 
 static inline int out_check_resent(const struct lu_env *env,
@@ -165,7 +130,7 @@ static inline int out_check_resent(const struct lu_env *env,
 				   struct dt_object *obj,
 				   struct ptlrpc_request *req,
 				   out_reconstruct_t reconstruct,
-				   struct update_reply *reply,
+				   struct object_update_reply *reply,
 				   int index)
 {
 	if (likely(!(lustre_msg_get_flags(req->rq_reqmsg) & MSG_RESENT)))
@@ -235,7 +200,7 @@ int out_tx_create_exec(const struct lu_env *env, struct thandle *th,
 	CDEBUG(D_INFO, "%s: insert create reply %p index %d: rc = %d\n",
 	       dt_obd_name(th->th_dev), arg->reply, arg->index, rc);
 
-	update_insert_reply(arg->reply, NULL, 0, arg->index, rc);
+	object_update_result_insert(arg->reply, NULL, 0, arg->index, rc);
 
 	return rc;
 }
@@ -244,20 +209,22 @@ static int __out_tx_create(const struct lu_env *env, struct dt_object *obj,
 			   struct lu_attr *attr, struct lu_fid *parent_fid,
 			   struct dt_object_format *dof,
 			   struct thandle_exec_args *ta,
-			   struct update_reply *reply,
-			   int index, char *file, int line)
+			   struct object_update_reply *reply,
+			   int index, const char *file, int line)
 {
 	struct tx_arg *arg;
+	int rc;
 
 	LASSERT(ta->ta_handle != NULL);
-	ta->ta_err = dt_declare_create(env, obj, attr, NULL, dof,
+	rc = dt_declare_create(env, obj, attr, NULL, dof,
 				       ta->ta_handle);
-	if (ta->ta_err != 0)
-		return ta->ta_err;
+	if (rc != 0)
+		return rc;
 
 	arg = tx_add_exec(ta, out_tx_create_exec, out_tx_create_undo, file,
 			  line);
-	LASSERT(arg);
+	if (IS_ERR(arg))
+		return PTR_ERR(arg);
 
 	/* release the object in out_trans_stop */
 	lu_object_get(&obj->do_lu);
@@ -276,7 +243,7 @@ static int __out_tx_create(const struct lu_env *env, struct dt_object *obj,
 static int out_create(struct tgt_session_info *tsi)
 {
 	struct tgt_thread_info	*tti = tgt_th_info(tsi->tsi_env);
-	struct update		*update = tti->tti_u.update.tti_update;
+	struct object_update	*update = tti->tti_u.update.tti_update;
 	struct dt_object        *obj = tti->tti_u.update.tti_dt_object;
 	struct dt_object_format	*dof = &tti->tti_u.update.tti_update_dof;
 	struct obdo		*lobdo = &tti->tti_u.update.tti_obdo;
@@ -288,28 +255,30 @@ static int out_create(struct tgt_session_info *tsi)
 
 	ENTRY;
 
-	wobdo = update_param_buf(update, 0, &size);
+	wobdo = object_update_param_get(update, 0, &size);
 	if (wobdo == NULL || size != sizeof(*wobdo)) {
 		CERROR("%s: obdo is NULL, invalid RPC: rc = %d\n",
 		       tgt_name(tsi->tsi_tgt), -EPROTO);
 		RETURN(err_serious(-EPROTO));
 	}
 
-	obdo_le_to_cpu(wobdo, wobdo);
+	if (ptlrpc_req_need_swab(tsi->tsi_pill->rc_req))
+		lustre_swab_obdo(wobdo);
 	lustre_get_wire_obdo(NULL, lobdo, wobdo);
 	la_from_obdo(attr, lobdo, lobdo->o_valid);
 
 	dof->dof_type = dt_mode_to_dft(attr->la_mode);
-	if (update->u_lens[1] > 0) {
+	if (update->ou_params_count > 1) {
 		int size;
 
-		fid = update_param_buf(update, 1, &size);
+		fid = object_update_param_get(update, 1, &size);
 		if (fid == NULL || size != sizeof(*fid)) {
 			CERROR("%s: invalid fid: rc = %d\n",
 			       tgt_name(tsi->tsi_tgt), -EPROTO);
 			RETURN(err_serious(-EPROTO));
 		}
-		fid_le_to_cpu(fid, fid);
+		if (ptlrpc_req_need_swab(tsi->tsi_pill->rc_req))
+			lustre_swab_lu_fid(fid);
 		if (!fid_is_sane(fid)) {
 			CERROR("%s: invalid fid "DFID": rc = %d\n",
 			       tgt_name(tsi->tsi_tgt), PFID(fid), -EPROTO);
@@ -354,7 +323,7 @@ static int out_tx_attr_set_exec(const struct lu_env *env, struct thandle *th,
 	CDEBUG(D_INFO, "%s: insert attr_set reply %p index %d: rc = %d\n",
 	       dt_obd_name(th->th_dev), arg->reply, arg->index, rc);
 
-	update_insert_reply(arg->reply, NULL, 0, arg->index, rc);
+	object_update_result_insert(arg->reply, NULL, 0, arg->index, rc);
 
 	return rc;
 }
@@ -363,19 +332,22 @@ static int __out_tx_attr_set(const struct lu_env *env,
 			     struct dt_object *dt_obj,
 			     const struct lu_attr *attr,
 			     struct thandle_exec_args *th,
-			     struct update_reply *reply, int index,
-			     char *file, int line)
+			     struct object_update_reply *reply,
+			     int index, const char *file, int line)
 {
-	struct tx_arg		*arg;
+	struct tx_arg	*arg;
+	int		rc;
 
 	LASSERT(th->ta_handle != NULL);
-	th->ta_err = dt_declare_attr_set(env, dt_obj, attr, th->ta_handle);
-	if (th->ta_err != 0)
-		return th->ta_err;
+	rc = dt_declare_attr_set(env, dt_obj, attr, th->ta_handle);
+	if (rc != 0)
+		return rc;
 
 	arg = tx_add_exec(th, out_tx_attr_set_exec, out_tx_attr_set_undo,
 			  file, line);
-	LASSERT(arg);
+	if (IS_ERR(arg))
+		return PTR_ERR(arg);
+
 	lu_object_get(&dt_obj->do_lu);
 	arg->object = dt_obj;
 	arg->u.attr_set.attr = *attr;
@@ -387,7 +359,7 @@ static int __out_tx_attr_set(const struct lu_env *env,
 static int out_attr_set(struct tgt_session_info *tsi)
 {
 	struct tgt_thread_info	*tti = tgt_th_info(tsi->tsi_env);
-	struct update		*update = tti->tti_u.update.tti_update;
+	struct object_update	*update = tti->tti_u.update.tti_update;
 	struct lu_attr		*attr = &tti->tti_attr;
 	struct dt_object        *obj = tti->tti_u.update.tti_dt_object;
 	struct obdo		*lobdo = &tti->tti_u.update.tti_obdo;
@@ -397,7 +369,7 @@ static int out_attr_set(struct tgt_session_info *tsi)
 
 	ENTRY;
 
-	wobdo = update_param_buf(update, 0, &size);
+	wobdo = object_update_param_get(update, 0, &size);
 	if (wobdo == NULL || size != sizeof(*wobdo)) {
 		CERROR("%s: empty obdo in the update: rc = %d\n",
 		       tgt_name(tsi->tsi_tgt), -EPROTO);
@@ -406,7 +378,9 @@ static int out_attr_set(struct tgt_session_info *tsi)
 
 	attr->la_valid = 0;
 	attr->la_valid = 0;
-	obdo_le_to_cpu(wobdo, wobdo);
+
+	if (ptlrpc_req_need_swab(tsi->tsi_pill->rc_req))
+		lustre_swab_obdo(wobdo);
 	lustre_get_wire_obdo(NULL, lobdo, wobdo);
 	la_from_obdo(attr, lobdo, lobdo->o_valid);
 
@@ -424,57 +398,28 @@ static int out_attr_get(struct tgt_session_info *tsi)
 	struct obdo		*obdo = &tti->tti_u.update.tti_obdo;
 	struct lu_attr		*la = &tti->tti_attr;
 	struct dt_object        *obj = tti->tti_u.update.tti_dt_object;
+	int			idx = tti->tti_u.update.tti_update_reply_index;
 	int			rc;
 
 	ENTRY;
 
-	if (!lu_object_exists(&obj->do_lu))
+	if (!lu_object_exists(&obj->do_lu)) {
+		/* Usually, this will be called when the master MDT try
+		 * to init a remote object(see osp_object_init), so if
+		 * the object does not exist on slave, we need set BANSHEE flag,
+		 * so the object can be removed from the cache immediately */
+		set_bit(LU_OBJECT_HEARD_BANSHEE,
+			&obj->do_lu.lo_header->loh_flags);
 		RETURN(-ENOENT);
+	}
 
 	dt_read_lock(env, obj, MOR_TGT_CHILD);
 	rc = dt_attr_get(env, obj, la, NULL);
 	if (rc)
 		GOTO(out_unlock, rc);
-	/*
-	 * If it is a directory, we will also check whether the
-	 * directory is empty.
-	 * la_flags = 0 : Empty.
-	 *          = 1 : Not empty.
-	 */
-	la->la_flags = 0;
-	if (S_ISDIR(la->la_mode)) {
-		struct dt_it		*it;
-		const struct dt_it_ops	*iops;
-
-		if (!dt_try_as_dir(env, obj))
-			GOTO(out_unlock, rc = -ENOTDIR);
-
-		iops = &obj->do_index_ops->dio_it;
-		it = iops->init(env, obj, LUDA_64BITHASH, BYPASS_CAPA);
-		if (!IS_ERR(it)) {
-			int  result;
-			result = iops->get(env, it, (const void *)"");
-			if (result > 0) {
-				int i;
-				for (result = 0, i = 0; result == 0 && i < 3;
-				     ++i)
-					result = iops->next(env, it);
-				if (result == 0)
-					la->la_flags = 1;
-			} else if (result == 0)
-				/*
-				 * Huh? Index contains no zero key?
-				 */
-				rc = -EIO;
-
-			iops->put(env, it);
-			iops->fini(env, it);
-		}
-	}
 
 	obdo->o_valid = 0;
 	obdo_from_la(obdo, la, la->la_valid);
-	obdo_cpu_to_le(obdo, obdo);
 	lustre_set_wire_obdo(NULL, obdo, obdo);
 
 out_unlock:
@@ -484,40 +429,51 @@ out_unlock:
 	       tgt_name(tsi->tsi_tgt), tti->tti_u.update.tti_update_reply,
 	       0, rc);
 
-	update_insert_reply(tti->tti_u.update.tti_update_reply, obdo,
-			    sizeof(*obdo),
-			    tti->tti_u.update.tti_update_reply_index, rc);
+	object_update_result_insert(tti->tti_u.update.tti_update_reply, obdo,
+				    sizeof(*obdo), idx, rc);
+
 	RETURN(rc);
 }
 
 static int out_xattr_get(struct tgt_session_info *tsi)
 {
-	const struct lu_env	*env = tsi->tsi_env;
-	struct tgt_thread_info	*tti = tgt_th_info(env);
-	struct update		*update = tti->tti_u.update.tti_update;
-	struct lu_buf		*lbuf = &tti->tti_buf;
-	struct update_reply     *reply = tti->tti_u.update.tti_update_reply;
-	struct dt_object        *obj = tti->tti_u.update.tti_dt_object;
-	char			*name;
-	void			*ptr;
-	int			 idx = tti->tti_u.update.tti_update_reply_index;
-	int			 rc;
+	const struct lu_env	   *env = tsi->tsi_env;
+	struct tgt_thread_info	   *tti = tgt_th_info(env);
+	struct object_update	   *update = tti->tti_u.update.tti_update;
+	struct lu_buf		   *lbuf = &tti->tti_buf;
+	struct object_update_reply *reply = tti->tti_u.update.tti_update_reply;
+	struct dt_object           *obj = tti->tti_u.update.tti_dt_object;
+	char			   *name;
+	struct object_update_result *update_result;
+	int			idx = tti->tti_u.update.tti_update_reply_index;
+	int			   rc;
 
 	ENTRY;
 
-	name = (char *)update_param_buf(update, 0, NULL);
+	if (!lu_object_exists(&obj->do_lu)) {
+		set_bit(LU_OBJECT_HEARD_BANSHEE,
+			&obj->do_lu.lo_header->loh_flags);
+		RETURN(-ENOENT);
+	}
+
+	name = object_update_param_get(update, 0, NULL);
 	if (name == NULL) {
 		CERROR("%s: empty name for xattr get: rc = %d\n",
 		       tgt_name(tsi->tsi_tgt), -EPROTO);
 		RETURN(err_serious(-EPROTO));
 	}
 
-	ptr = update_get_buf_internal(reply, idx, NULL);
-	LASSERT(ptr != NULL);
+	update_result = object_update_result_get(reply, 0, NULL);
+	if (update_result == NULL) {
+		CERROR("%s: empty name for xattr get: rc = %d\n",
+		       tgt_name(tsi->tsi_tgt), -EPROTO);
+		RETURN(err_serious(-EPROTO));
+	}
 
-	/* The first 4 bytes(int) are used to store the result */
-	lbuf->lb_buf = (char *)ptr + sizeof(int);
-	lbuf->lb_len = UPDATE_BUFFER_SIZE - sizeof(struct update_reply);
+	lbuf->lb_buf = update_result->our_data;
+	lbuf->lb_len = OUT_UPDATE_REPLY_SIZE -
+		       cfs_size_round((unsigned long)update_result->our_data -
+				      (unsigned long)update_result);
 	dt_read_lock(env, obj, MOR_TGT_CHILD);
 	rc = dt_xattr_get(env, obj, lbuf, name, NULL);
 	dt_read_unlock(env, obj);
@@ -538,17 +494,15 @@ static int out_xattr_get(struct tgt_session_info *tsi)
 	GOTO(out, rc);
 
 out:
-	*(int *)ptr = rc;
-	reply->ur_lens[idx] = lbuf->lb_len + sizeof(int);
-
-	return rc;
+	object_update_result_insert(reply, lbuf->lb_buf, lbuf->lb_len, idx, rc);
+	RETURN(rc);
 }
 
 static int out_index_lookup(struct tgt_session_info *tsi)
 {
 	const struct lu_env	*env = tsi->tsi_env;
 	struct tgt_thread_info	*tti = tgt_th_info(env);
-	struct update		*update = tti->tti_u.update.tti_update;
+	struct object_update	*update = tti->tti_u.update.tti_update;
 	struct dt_object	*obj = tti->tti_u.update.tti_dt_object;
 	char			*name;
 	int			 rc;
@@ -558,7 +512,7 @@ static int out_index_lookup(struct tgt_session_info *tsi)
 	if (!lu_object_exists(&obj->do_lu))
 		RETURN(-ENOENT);
 
-	name = (char *)update_param_buf(update, 0, NULL);
+	name = object_update_param_get(update, 0, NULL);
 	if (name == NULL) {
 		CERROR("%s: empty name for lookup: rc = %d\n",
 		       tgt_name(tsi->tsi_tgt), -EPROTO);
@@ -578,19 +532,18 @@ static int out_index_lookup(struct tgt_session_info *tsi)
 	if (rc == 0)
 		rc += 1;
 
+out_unlock:
+	dt_read_unlock(env, obj);
+
 	CDEBUG(D_INFO, "lookup "DFID" %s get "DFID" rc %d\n",
 	       PFID(lu_object_fid(&obj->do_lu)), name,
 	       PFID(&tti->tti_fid1), rc);
-	fid_cpu_to_le(&tti->tti_fid1, &tti->tti_fid1);
-
-out_unlock:
-	dt_read_unlock(env, obj);
 
 	CDEBUG(D_INFO, "%s: insert lookup reply %p index %d: rc = %d\n",
 	       tgt_name(tsi->tsi_tgt), tti->tti_u.update.tti_update_reply,
 	       0, rc);
 
-	update_insert_reply(tti->tti_u.update.tti_update_reply,
+	object_update_result_insert(tti->tti_u.update.tti_update_reply,
 			    &tti->tti_fid1, sizeof(tti->tti_fid1),
 			    tti->tti_u.update.tti_update_reply_index, rc);
 	RETURN(rc);
@@ -607,6 +560,9 @@ static int out_tx_xattr_set_exec(const struct lu_env *env,
 	       dt_obd_name(th->th_dev), arg->u.xattr_set.buf.lb_buf,
 	       arg->u.xattr_set.name, arg->u.xattr_set.flags);
 
+	if (!lu_object_exists(&dt_obj->do_lu))
+		GOTO(out, rc = -ENOENT);
+
 	dt_write_lock(env, dt_obj, MOR_TGT_CHILD);
 	rc = dt_xattr_set(env, dt_obj, &arg->u.xattr_set.buf,
 			  arg->u.xattr_set.name, arg->u.xattr_set.flags,
@@ -617,11 +573,11 @@ static int out_tx_xattr_set_exec(const struct lu_env *env,
 	 **/
 	if (unlikely(rc && !strcmp(arg->u.xattr_set.name, XATTR_NAME_LINK)))
 		rc = 0;
-
+out:
 	CDEBUG(D_INFO, "%s: insert xattr set reply %p index %d: rc = %d\n",
 	       dt_obd_name(th->th_dev), arg->reply, arg->index, rc);
 
-	update_insert_reply(arg->reply, NULL, 0, arg->index, rc);
+	object_update_result_insert(arg->reply, NULL, 0, arg->index, rc);
 
 	return rc;
 }
@@ -631,19 +587,21 @@ static int __out_tx_xattr_set(const struct lu_env *env,
 			      const struct lu_buf *buf,
 			      const char *name, int flags,
 			      struct thandle_exec_args *ta,
-			      struct update_reply *reply, int index,
-			      char *file, int line)
+			      struct object_update_reply *reply,
+			      int index, const char *file, int line)
 {
-	struct tx_arg		*arg;
+	struct tx_arg	*arg;
+	int		rc;
 
 	LASSERT(ta->ta_handle != NULL);
-	ta->ta_err = dt_declare_xattr_set(env, dt_obj, buf, name,
-					  flags, ta->ta_handle);
-	if (ta->ta_err != 0)
-		return ta->ta_err;
+	rc = dt_declare_xattr_set(env, dt_obj, buf, name, flags, ta->ta_handle);
+	if (rc != 0)
+		return rc;
 
 	arg = tx_add_exec(ta, out_tx_xattr_set_exec, NULL, file, line);
-	LASSERT(arg);
+	if (IS_ERR(arg))
+		return PTR_ERR(arg);
+
 	lu_object_get(&dt_obj->do_lu);
 	arg->object = dt_obj;
 	arg->u.xattr_set.name = name;
@@ -658,25 +616,26 @@ static int __out_tx_xattr_set(const struct lu_env *env,
 static int out_xattr_set(struct tgt_session_info *tsi)
 {
 	struct tgt_thread_info	*tti = tgt_th_info(tsi->tsi_env);
-	struct update		*update = tti->tti_u.update.tti_update;
+	struct object_update	*update = tti->tti_u.update.tti_update;
 	struct dt_object	*obj = tti->tti_u.update.tti_dt_object;
 	struct lu_buf		*lbuf = &tti->tti_buf;
 	char			*name;
 	char			*buf;
-	char			*tmp;
+	__u32			*tmp;
 	int			 buf_len = 0;
 	int			 flag;
+	int			 size = 0;
 	int			 rc;
 	ENTRY;
 
-	name = update_param_buf(update, 0, NULL);
+	name = object_update_param_get(update, 0, NULL);
 	if (name == NULL) {
 		CERROR("%s: empty name for xattr set: rc = %d\n",
 		       tgt_name(tsi->tsi_tgt), -EPROTO);
 		RETURN(err_serious(-EPROTO));
 	}
 
-	buf = (char *)update_param_buf(update, 1, &buf_len);
+	buf = object_update_param_get(update, 1, &buf_len);
 	if (buf == NULL || buf_len == 0) {
 		CERROR("%s: empty buf for xattr set: rc = %d\n",
 		       tgt_name(tsi->tsi_tgt), -EPROTO);
@@ -686,14 +645,16 @@ static int out_xattr_set(struct tgt_session_info *tsi)
 	lbuf->lb_buf = buf;
 	lbuf->lb_len = buf_len;
 
-	tmp = (char *)update_param_buf(update, 2, NULL);
-	if (tmp == NULL) {
-		CERROR("%s: empty flag for xattr set: rc = %d\n",
-		       tgt_name(tsi->tsi_tgt), -EPROTO);
+	tmp = object_update_param_get(update, 2, &size);
+	if (tmp == NULL || size != sizeof(*tmp)) {
+		CERROR("%s: emptry or wrong size %d flag: rc = %d\n",
+		       tgt_name(tsi->tsi_tgt), size, -EPROTO);
 		RETURN(err_serious(-EPROTO));
 	}
 
-	flag = le32_to_cpu(*(int *)tmp);
+	if (ptlrpc_req_need_swab(tsi->tsi_pill->rc_req))
+		__swab32s(tmp);
+	flag = *tmp;
 
 	rc = out_tx_xattr_set(tsi->tsi_env, obj, lbuf, name, flag,
 			      &tti->tti_tea,
@@ -702,6 +663,79 @@ static int out_xattr_set(struct tgt_session_info *tsi)
 	RETURN(rc);
 }
 
+static int out_tx_xattr_del_exec(const struct lu_env *env, struct thandle *th,
+				 struct tx_arg *arg)
+{
+	struct dt_object *dt_obj = arg->object;
+	int rc;
+
+	CDEBUG(D_INFO, "%s: del xattr name '%s' on "DFID"\n",
+	       dt_obd_name(th->th_dev), arg->u.xattr_set.name,
+	       PFID(lu_object_fid(&dt_obj->do_lu)));
+
+	if (!lu_object_exists(&dt_obj->do_lu))
+		GOTO(out, rc = -ENOENT);
+
+	dt_write_lock(env, dt_obj, MOR_TGT_CHILD);
+	rc = dt_xattr_del(env, dt_obj, arg->u.xattr_set.name,
+			  th, NULL);
+	dt_write_unlock(env, dt_obj);
+out:
+	CDEBUG(D_INFO, "%s: insert xattr del reply %p index %d: rc = %d\n",
+	       dt_obd_name(th->th_dev), arg->reply, arg->index, rc);
+
+	object_update_result_insert(arg->reply, NULL, 0, arg->index, rc);
+
+	return rc;
+}
+
+static int __out_tx_xattr_del(const struct lu_env *env,
+			      struct dt_object *dt_obj, const char *name,
+			      struct thandle_exec_args *ta,
+			      struct object_update_reply *reply,
+			      int index, const char *file, int line)
+{
+	struct tx_arg	*arg;
+	int		rc;
+
+	rc = dt_declare_xattr_del(env, dt_obj, name, ta->ta_handle);
+	if (rc != 0)
+		return rc;
+
+	arg = tx_add_exec(ta, out_tx_xattr_del_exec, NULL, file, line);
+	if (IS_ERR(arg))
+		return PTR_ERR(arg);
+
+	lu_object_get(&dt_obj->do_lu);
+	arg->object = dt_obj;
+	arg->u.xattr_set.name = name;
+	arg->reply = reply;
+	arg->index = index;
+	return 0;
+}
+
+static int out_xattr_del(struct tgt_session_info *tsi)
+{
+	struct tgt_thread_info	*tti = tgt_th_info(tsi->tsi_env);
+	struct object_update	*update = tti->tti_u.update.tti_update;
+	struct dt_object	*obj = tti->tti_u.update.tti_dt_object;
+	char			*name;
+	int			 rc;
+	ENTRY;
+
+	name = object_update_param_get(update, 0, NULL);
+	if (name == NULL) {
+		CERROR("%s: empty name for xattr set: rc = %d\n",
+		       tgt_name(tsi->tsi_tgt), -EPROTO);
+		RETURN(err_serious(-EPROTO));
+	}
+
+	rc = out_tx_xattr_del(tsi->tsi_env, obj, name, &tti->tti_tea,
+			      tti->tti_u.update.tti_update_reply,
+			      tti->tti_u.update.tti_update_reply_index);
+	RETURN(rc);
+}
+
 static int out_obj_ref_add(const struct lu_env *env,
 			   struct dt_object *dt_obj,
 			   struct thandle *th)
@@ -739,7 +773,7 @@ static int out_tx_ref_add_exec(const struct lu_env *env, struct thandle *th,
 	CDEBUG(D_INFO, "%s: insert ref_add reply %p index %d: rc = %d\n",
 	       dt_obd_name(th->th_dev), arg->reply, arg->index, rc);
 
-	update_insert_reply(arg->reply, NULL, 0, arg->index, rc);
+	object_update_result_insert(arg->reply, NULL, 0, arg->index, rc);
 	return rc;
 }
 
@@ -752,19 +786,22 @@ static int out_tx_ref_add_undo(const struct lu_env *env, struct thandle *th,
 static int __out_tx_ref_add(const struct lu_env *env,
 			    struct dt_object *dt_obj,
 			    struct thandle_exec_args *ta,
-			    struct update_reply *reply,
-			    int index, char *file, int line)
+			    struct object_update_reply *reply,
+			    int index, const char *file, int line)
 {
 	struct tx_arg	*arg;
+	int		rc;
 
 	LASSERT(ta->ta_handle != NULL);
-	ta->ta_err = dt_declare_ref_add(env, dt_obj, ta->ta_handle);
-	if (ta->ta_err != 0)
-		return ta->ta_err;
+	rc = dt_declare_ref_add(env, dt_obj, ta->ta_handle);
+	if (rc != 0)
+		return rc;
 
 	arg = tx_add_exec(ta, out_tx_ref_add_exec, out_tx_ref_add_undo, file,
 			  line);
-	LASSERT(arg);
+	if (IS_ERR(arg))
+		return PTR_ERR(arg);
+
 	lu_object_get(&dt_obj->do_lu);
 	arg->object = dt_obj;
 	arg->reply = reply;
@@ -800,7 +837,7 @@ static int out_tx_ref_del_exec(const struct lu_env *env, struct thandle *th,
 	CDEBUG(D_INFO, "%s: insert ref_del reply %p index %d: rc = %d\n",
 	       dt_obd_name(th->th_dev), arg->reply, arg->index, 0);
 
-	update_insert_reply(arg->reply, NULL, 0, arg->index, rc);
+	object_update_result_insert(arg->reply, NULL, 0, arg->index, rc);
 
 	return rc;
 }
@@ -814,19 +851,22 @@ static int out_tx_ref_del_undo(const struct lu_env *env, struct thandle *th,
 static int __out_tx_ref_del(const struct lu_env *env,
 			    struct dt_object *dt_obj,
 			    struct thandle_exec_args *ta,
-			    struct update_reply *reply,
-			    int index, char *file, int line)
+			    struct object_update_reply *reply,
+			    int index, const char *file, int line)
 {
 	struct tx_arg	*arg;
+	int		rc;
 
 	LASSERT(ta->ta_handle != NULL);
-	ta->ta_err = dt_declare_ref_del(env, dt_obj, ta->ta_handle);
-	if (ta->ta_err != 0)
-		return ta->ta_err;
+	rc = dt_declare_ref_del(env, dt_obj, ta->ta_handle);
+	if (rc != 0)
+		return rc;
 
 	arg = tx_add_exec(ta, out_tx_ref_del_exec, out_tx_ref_del_undo, file,
 			  line);
-	LASSERT(arg);
+	if (IS_ERR(arg))
+		return PTR_ERR(arg);
+
 	lu_object_get(&dt_obj->do_lu);
 	arg->object = dt_obj;
 	arg->reply = reply;
@@ -906,7 +946,7 @@ static int out_tx_index_insert_exec(const struct lu_env *env,
 	CDEBUG(D_INFO, "%s: insert idx insert reply %p index %d: rc = %d\n",
 	       dt_obd_name(th->th_dev), arg->reply, arg->index, rc);
 
-	update_insert_reply(arg->reply, NULL, 0, arg->index, rc);
+	object_update_result_insert(arg->reply, NULL, 0, arg->index, rc);
 
 	return rc;
 }
@@ -921,31 +961,28 @@ static int __out_tx_index_insert(const struct lu_env *env,
 				 struct dt_object *dt_obj,
 				 char *name, struct lu_fid *fid,
 				 struct thandle_exec_args *ta,
-				 struct update_reply *reply,
-				 int index, char *file, int line)
+				 struct object_update_reply *reply,
+				 int index, const char *file, int line)
 {
-	struct tx_arg *arg;
+	struct tx_arg	*arg;
+	int		rc;
 
 	LASSERT(ta->ta_handle != NULL);
-
-	if (lu_object_exists(&dt_obj->do_lu)) {
-		if (dt_try_as_dir(env, dt_obj) == 0) {
-			ta->ta_err = -ENOTDIR;
-			return ta->ta_err;
-		}
-		ta->ta_err = dt_declare_insert(env, dt_obj,
-					       (struct dt_rec *)fid,
-					       (struct dt_key *)name,
-					       ta->ta_handle);
+	if (dt_try_as_dir(env, dt_obj) == 0) {
+		rc = -ENOTDIR;
+		return rc;
 	}
 
-	if (ta->ta_err != 0)
-		return ta->ta_err;
+	rc = dt_declare_insert(env, dt_obj, (struct dt_rec *)fid,
+			       (struct dt_key *)name, ta->ta_handle);
+	if (rc != 0)
+		return rc;
 
 	arg = tx_add_exec(ta, out_tx_index_insert_exec,
-			  out_tx_index_insert_undo, file,
-			  line);
-	LASSERT(arg);
+			  out_tx_index_insert_undo, file, line);
+	if (IS_ERR(arg))
+		return PTR_ERR(arg);
+
 	lu_object_get(&dt_obj->do_lu);
 	arg->object = dt_obj;
 	arg->reply = reply;
@@ -959,7 +996,7 @@ static int __out_tx_index_insert(const struct lu_env *env,
 static int out_index_insert(struct tgt_session_info *tsi)
 {
 	struct tgt_thread_info	*tti = tgt_th_info(tsi->tsi_env);
-	struct update	  *update = tti->tti_u.update.tti_update;
+	struct object_update	*update = tti->tti_u.update.tti_update;
 	struct dt_object  *obj = tti->tti_u.update.tti_dt_object;
 	struct lu_fid	  *fid;
 	char		  *name;
@@ -968,21 +1005,23 @@ static int out_index_insert(struct tgt_session_info *tsi)
 
 	ENTRY;
 
-	name = (char *)update_param_buf(update, 0, NULL);
+	name = object_update_param_get(update, 0, NULL);
 	if (name == NULL) {
 		CERROR("%s: empty name for index insert: rc = %d\n",
 		       tgt_name(tsi->tsi_tgt), -EPROTO);
 		RETURN(err_serious(-EPROTO));
 	}
 
-	fid = (struct lu_fid *)update_param_buf(update, 1, &size);
+	fid = object_update_param_get(update, 1, &size);
 	if (fid == NULL || size != sizeof(*fid)) {
 		CERROR("%s: invalid fid: rc = %d\n",
 		       tgt_name(tsi->tsi_tgt), -EPROTO);
 		       RETURN(err_serious(-EPROTO));
 	}
 
-	fid_le_to_cpu(fid, fid);
+	if (ptlrpc_req_need_swab(tsi->tsi_pill->rc_req))
+		lustre_swab_lu_fid(fid);
+
 	if (!fid_is_sane(fid)) {
 		CERROR("%s: invalid FID "DFID": rc = %d\n",
 		       tgt_name(tsi->tsi_tgt), PFID(fid), -EPROTO);
@@ -1007,7 +1046,7 @@ static int out_tx_index_delete_exec(const struct lu_env *env,
 	CDEBUG(D_INFO, "%s: insert idx insert reply %p index %d: rc = %d\n",
 	       dt_obd_name(th->th_dev), arg->reply, arg->index, rc);
 
-	update_insert_reply(arg->reply, NULL, 0, arg->index, rc);
+	object_update_result_insert(arg->reply, NULL, 0, arg->index, rc);
 
 	return rc;
 }
@@ -1024,27 +1063,28 @@ static int out_tx_index_delete_undo(const struct lu_env *env,
 static int __out_tx_index_delete(const struct lu_env *env,
 				 struct dt_object *dt_obj, char *name,
 				 struct thandle_exec_args *ta,
-				 struct update_reply *reply,
-				 int index, char *file, int line)
+				 struct object_update_reply *reply,
+				 int index, const char *file, int line)
 {
-	struct tx_arg *arg;
+	struct tx_arg	*arg;
+	int		rc;
 
 	if (dt_try_as_dir(env, dt_obj) == 0) {
-		ta->ta_err = -ENOTDIR;
-		return ta->ta_err;
+		rc = -ENOTDIR;
+		return rc;
 	}
 
 	LASSERT(ta->ta_handle != NULL);
-	ta->ta_err = dt_declare_delete(env, dt_obj,
-				       (struct dt_key *)name,
-				       ta->ta_handle);
-	if (ta->ta_err != 0)
-		return ta->ta_err;
+	rc = dt_declare_delete(env, dt_obj, (struct dt_key *)name,
+			       ta->ta_handle);
+	if (rc != 0)
+		return rc;
 
 	arg = tx_add_exec(ta, out_tx_index_delete_exec,
-			  out_tx_index_delete_undo, file,
-			  line);
-	LASSERT(arg);
+			  out_tx_index_delete_undo, file, line);
+	if (IS_ERR(arg))
+		return PTR_ERR(arg);
+
 	lu_object_get(&dt_obj->do_lu);
 	arg->object = dt_obj;
 	arg->reply = reply;
@@ -1056,7 +1096,7 @@ static int __out_tx_index_delete(const struct lu_env *env,
 static int out_index_delete(struct tgt_session_info *tsi)
 {
 	struct tgt_thread_info	*tti = tgt_th_info(tsi->tsi_env);
-	struct update		*update = tti->tti_u.update.tti_update;
+	struct object_update	*update = tti->tti_u.update.tti_update;
 	struct dt_object	*obj = tti->tti_u.update.tti_dt_object;
 	char			*name;
 	int			 rc = 0;
@@ -1064,7 +1104,7 @@ static int out_index_delete(struct tgt_session_info *tsi)
 	if (!lu_object_exists(&obj->do_lu))
 		RETURN(-ENOENT);
 
-	name = (char *)update_param_buf(update, 0, NULL);
+	name = object_update_param_get(update, 0, NULL);
 	if (name == NULL) {
 		CERROR("%s: empty name for index delete: rc = %d\n",
 		       tgt_name(tsi->tsi_tgt), -EPROTO);
@@ -1088,7 +1128,7 @@ static int out_tx_destroy_exec(const struct lu_env *env, struct thandle *th,
 	CDEBUG(D_INFO, "%s: insert destroy reply %p index %d: rc = %d\n",
 	       dt_obd_name(th->th_dev), arg->reply, arg->index, rc);
 
-	update_insert_reply(arg->reply, NULL, 0, arg->index, rc);
+	object_update_result_insert(arg->reply, NULL, 0, arg->index, rc);
 
 	RETURN(rc);
 }
@@ -1103,19 +1143,22 @@ static int out_tx_destroy_undo(const struct lu_env *env, struct thandle *th,
 
 static int __out_tx_destroy(const struct lu_env *env, struct dt_object *dt_obj,
 			     struct thandle_exec_args *ta,
-			     struct update_reply *reply,
-			     int index, char *file, int line)
+			     struct object_update_reply *reply,
+			     int index, const char *file, int line)
 {
-	struct tx_arg *arg;
+	struct tx_arg	*arg;
+	int		rc;
 
 	LASSERT(ta->ta_handle != NULL);
-	ta->ta_err = dt_declare_destroy(env, dt_obj, ta->ta_handle);
-	if (ta->ta_err)
-		return ta->ta_err;
+	rc = dt_declare_destroy(env, dt_obj, ta->ta_handle);
+	if (rc != 0)
+		return rc;
 
 	arg = tx_add_exec(ta, out_tx_destroy_exec, out_tx_destroy_undo,
 			  file, line);
-	LASSERT(arg);
+	if (IS_ERR(arg))
+		return PTR_ERR(arg);
+
 	lu_object_get(&dt_obj->do_lu);
 	arg->object = dt_obj;
 	arg->reply = reply;
@@ -1126,14 +1169,13 @@ static int __out_tx_destroy(const struct lu_env *env, struct dt_object *dt_obj,
 static int out_destroy(struct tgt_session_info *tsi)
 {
 	struct tgt_thread_info	*tti = tgt_th_info(tsi->tsi_env);
-	struct update		*update = tti->tti_u.update.tti_update;
+	struct object_update	*update = tti->tti_u.update.tti_update;
 	struct dt_object	*obj = tti->tti_u.update.tti_dt_object;
 	struct lu_fid		*fid;
 	int			 rc;
 	ENTRY;
 
-	fid = &update->u_fid;
-	fid_le_to_cpu(fid, fid);
+	fid = &update->ou_fid;
 	if (!fid_is_sane(fid)) {
 		CERROR("%s: invalid FID "DFID": rc = %d\n",
 		       tgt_name(tsi->tsi_tgt), PFID(fid), -EPROTO);
@@ -1150,8 +1192,96 @@ static int out_destroy(struct tgt_session_info *tsi)
 	RETURN(rc);
 }
 
+static int out_tx_write_exec(const struct lu_env *env, struct thandle *th,
+			     struct tx_arg *arg)
+{
+	struct dt_object *dt_obj = arg->object;
+	int rc;
+
+	dt_write_lock(env, dt_obj, MOR_TGT_CHILD);
+	rc = dt_record_write(env, dt_obj, &arg->u.write.buf,
+			     &arg->u.write.pos, th);
+	dt_write_unlock(env, dt_obj);
+
+	if (rc == 0)
+		rc = arg->u.write.buf.lb_len;
+
+	object_update_result_insert(arg->reply, NULL, 0, arg->index, rc);
+
+	return rc > 0 ? 0 : rc;
+}
+
+static int __out_tx_write(const struct lu_env *env,
+			  struct dt_object *dt_obj,
+			  const struct lu_buf *buf,
+			  loff_t pos, struct thandle_exec_args *ta,
+			  struct object_update_reply *reply,
+			  int index, const char *file, int line)
+{
+	struct tx_arg	*arg;
+	int		rc;
+
+	LASSERT(ta->ta_handle != NULL);
+	rc = dt_declare_record_write(env, dt_obj, buf, pos, ta->ta_handle);
+	if (rc != 0)
+		return rc;
+
+	arg = tx_add_exec(ta, out_tx_write_exec, NULL, file, line);
+	if (IS_ERR(arg))
+		return PTR_ERR(arg);
+
+	lu_object_get(&dt_obj->do_lu);
+	arg->object = dt_obj;
+	arg->u.write.buf = *buf;
+	arg->u.write.pos = pos;
+	arg->reply = reply;
+	arg->index = index;
+	return 0;
+}
+
+static int out_write(struct tgt_session_info *tsi)
+{
+	struct tgt_thread_info	*tti = tgt_th_info(tsi->tsi_env);
+	struct object_update	*update = tti->tti_u.update.tti_update;
+	struct dt_object	*obj = tti->tti_u.update.tti_dt_object;
+	struct lu_buf		*lbuf = &tti->tti_buf;
+	char			*buf;
+	__u64			*tmp;
+	int			size = 0;
+	int			buf_len = 0;
+	loff_t			pos;
+	int			 rc;
+	ENTRY;
+
+	buf = object_update_param_get(update, 0, &buf_len);
+	if (buf == NULL || buf_len == 0) {
+		CERROR("%s: empty buf for xattr set: rc = %d\n",
+		       tgt_name(tsi->tsi_tgt), -EPROTO);
+		RETURN(err_serious(-EPROTO));
+	}
+	lbuf->lb_buf = buf;
+	lbuf->lb_len = buf_len;
+
+	tmp = object_update_param_get(update, 1, &size);
+	if (tmp == NULL || size != sizeof(*tmp)) {
+		CERROR("%s: empty or wrong size %d pos: rc = %d\n",
+		       tgt_name(tsi->tsi_tgt), size, -EPROTO);
+		RETURN(err_serious(-EPROTO));
+	}
+
+	if (ptlrpc_req_need_swab(tsi->tsi_pill->rc_req))
+		__swab64s(tmp);
+	pos = *tmp;
+
+	rc = out_tx_write(tsi->tsi_env, obj, lbuf, pos,
+			  &tti->tti_tea,
+			  tti->tti_u.update.tti_update_reply,
+			  tti->tti_u.update.tti_update_reply_index);
+	RETURN(rc);
+}
+
 #define DEF_OUT_HNDL(opc, name, flags, fn)     \
-[opc - OBJ_CREATE] = {					\
+[opc - OUT_CREATE] = {					\
 	.th_name    = name,				\
 	.th_fail_id = 0,				\
 	.th_opc     = opc,				\
@@ -1161,30 +1291,32 @@ static int out_destroy(struct tgt_session_info *tsi)
 	.th_version = 0,				\
 }
 
-#define out_handler mdt_handler
 static struct tgt_handler out_update_ops[] = {
-	DEF_OUT_HNDL(OBJ_CREATE, "obj_create", MUTABOR | HABEO_REFERO,
+	DEF_OUT_HNDL(OUT_CREATE, "out_create", MUTABOR | HABEO_REFERO,
 		     out_create),
-	DEF_OUT_HNDL(OBJ_DESTROY, "obj_create", MUTABOR | HABEO_REFERO,
+	DEF_OUT_HNDL(OUT_DESTROY, "out_create", MUTABOR | HABEO_REFERO,
 		     out_destroy),
-	DEF_OUT_HNDL(OBJ_REF_ADD, "obj_ref_add", MUTABOR | HABEO_REFERO,
+	DEF_OUT_HNDL(OUT_REF_ADD, "out_ref_add", MUTABOR | HABEO_REFERO,
 		     out_ref_add),
-	DEF_OUT_HNDL(OBJ_REF_DEL, "obj_ref_del", MUTABOR | HABEO_REFERO,
+	DEF_OUT_HNDL(OUT_REF_DEL, "out_ref_del", MUTABOR | HABEO_REFERO,
 		     out_ref_del),
-	DEF_OUT_HNDL(OBJ_ATTR_SET, "obj_attr_set",  MUTABOR | HABEO_REFERO,
+	DEF_OUT_HNDL(OUT_ATTR_SET, "out_attr_set",  MUTABOR | HABEO_REFERO,
 		     out_attr_set),
-	DEF_OUT_HNDL(OBJ_ATTR_GET, "obj_attr_get",  HABEO_REFERO,
+	DEF_OUT_HNDL(OUT_ATTR_GET, "out_attr_get",  HABEO_REFERO,
 		     out_attr_get),
-	DEF_OUT_HNDL(OBJ_XATTR_SET, "obj_xattr_set", MUTABOR | HABEO_REFERO,
+	DEF_OUT_HNDL(OUT_XATTR_SET, "out_xattr_set", MUTABOR | HABEO_REFERO,
 		     out_xattr_set),
-	DEF_OUT_HNDL(OBJ_XATTR_GET, "obj_xattr_get", HABEO_REFERO,
+	DEF_OUT_HNDL(OUT_XATTR_DEL, "out_xattr_del", MUTABOR | HABEO_REFERO,
+		     out_xattr_del),
+	DEF_OUT_HNDL(OUT_XATTR_GET, "out_xattr_get", HABEO_REFERO,
 		     out_xattr_get),
-	DEF_OUT_HNDL(OBJ_INDEX_LOOKUP, "obj_index_lookup", HABEO_REFERO,
+	DEF_OUT_HNDL(OUT_INDEX_LOOKUP, "out_index_lookup", HABEO_REFERO,
 		     out_index_lookup),
-	DEF_OUT_HNDL(OBJ_INDEX_INSERT, "obj_index_insert",
+	DEF_OUT_HNDL(OUT_INDEX_INSERT, "out_index_insert",
 		     MUTABOR | HABEO_REFERO, out_index_insert),
-	DEF_OUT_HNDL(OBJ_INDEX_DELETE, "obj_index_delete",
+	DEF_OUT_HNDL(OUT_INDEX_DELETE, "out_index_delete",
 		     MUTABOR | HABEO_REFERO, out_index_delete),
+	DEF_OUT_HNDL(OUT_WRITE, "out_write", MUTABOR | HABEO_REFERO, out_write),
 };
 
 struct tgt_handler *out_handler_find(__u32 opc)
@@ -1192,8 +1324,8 @@ struct tgt_handler *out_handler_find(__u32 opc)
 	struct tgt_handler *h;
 
 	h = NULL;
-	if (OBJ_CREATE <= opc && opc < OBJ_LAST) {
-		h = &out_update_ops[opc - OBJ_CREATE];
+	if (OUT_CREATE <= opc && opc < OUT_LAST) {
+		h = &out_update_ops[opc - OUT_CREATE];
 		LASSERTF(h->th_opc == opc, "opcode mismatch %d != %d\n",
 			 h->th_opc, opc);
 	} else {
@@ -1202,6 +1334,119 @@ struct tgt_handler *out_handler_find(__u32 opc)
 	return h;
 }
 
+static int out_tx_start(const struct lu_env *env, struct dt_device *dt,
+			struct thandle_exec_args *ta, struct obd_export *exp)
+{
+	ta->ta_argno = 0;
+	ta->ta_handle = dt_trans_create(env, dt);
+	if (IS_ERR(ta->ta_handle)) {
+		int rc;
+
+		rc = PTR_ERR(ta->ta_handle);
+		ta->ta_handle = NULL;
+		CERROR("%s: start handle error: rc = %d\n", dt_obd_name(dt),
+		       rc);
+		return rc;
+	}
+	if (exp->exp_need_sync)
+		ta->ta_handle->th_sync = 1;
+
+	return 0;
+}
+
+static int out_trans_start(const struct lu_env *env,
+			   struct thandle_exec_args *ta)
+{
+	return dt_trans_start(env, ta->ta_handle->th_dev, ta->ta_handle);
+}
+
+static int out_trans_stop(const struct lu_env *env,
+			  struct thandle_exec_args *ta, int err)
+{
+	int i;
+	int rc;
+
+	ta->ta_handle->th_result = err;
+	rc = dt_trans_stop(env, ta->ta_handle->th_dev, ta->ta_handle);
+	for (i = 0; i < ta->ta_argno; i++) {
+		if (ta->ta_args[i]->object != NULL) {
+			struct dt_object *obj = ta->ta_args[i]->object;
+
+			/* If the object is being created during this
+			 * transaction, we need to remove them from the
+			 * cache immediately, because a few layers are
+			 * missing in OUT handler, i.e. the object might
+			 * not be initialized in all layers */
+			if (ta->ta_args[i]->exec_fn == out_tx_create_exec)
+				set_bit(LU_OBJECT_HEARD_BANSHEE,
+					&obj->do_lu.lo_header->loh_flags);
+			lu_object_put(env, &ta->ta_args[i]->object->do_lu);
+			ta->ta_args[i]->object = NULL;
+		}
+	}
+	ta->ta_handle = NULL;
+	ta->ta_argno = 0;
+
+	return rc;
+}
+
+int out_tx_end(const struct lu_env *env, struct thandle_exec_args *ta,
+	       int declare_ret)
+{
+	struct tgt_session_info	*tsi = tgt_ses_info(env);
+	int			i;
+	int			rc;
+	int			rc1;
+	ENTRY;
+
+	if (ta->ta_handle == NULL)
+		RETURN(0);
+
+	if (declare_ret != 0 || ta->ta_argno == 0)
+		GOTO(stop, rc = declare_ret);
+
+	LASSERT(ta->ta_handle->th_dev != NULL);
+	rc = out_trans_start(env, ta);
+	if (unlikely(rc != 0))
+		GOTO(stop, rc);
+
+	for (i = 0; i < ta->ta_argno; i++) {
+		rc = ta->ta_args[i]->exec_fn(env, ta->ta_handle,
+					     ta->ta_args[i]);
+		if (unlikely(rc != 0)) {
+			CDEBUG(D_INFO, "error during execution of #%u from"
+			       " %s:%d: rc = %d\n", i, ta->ta_args[i]->file,
+			       ta->ta_args[i]->line, rc);
+			while (--i >= 0) {
+				if (ta->ta_args[i]->undo_fn != NULL)
+					ta->ta_args[i]->undo_fn(env,
+							       ta->ta_handle,
+							       ta->ta_args[i]);
+				else
+					CERROR("%s: undo for %s:%d: rc = %d\n",
+					     dt_obd_name(ta->ta_handle->th_dev),
+					       ta->ta_args[i]->file,
+					       ta->ta_args[i]->line, -ENOTSUPP);
+			}
+			break;
+		}
+		CDEBUG(D_INFO, "%s: executed %u/%u: rc = %d\n",
+		       dt_obd_name(ta->ta_handle->th_dev), i, ta->ta_argno, rc);
+	}
+
+	/* Only fail for real update */
+	tsi->tsi_reply_fail_id = OBD_FAIL_OUT_UPDATE_NET_REP;
+stop:
+	rc1 = out_trans_stop(env, ta, rc);
+	if (rc == 0)
+		rc = rc1;
+
+	ta->ta_handle = NULL;
+	ta->ta_argno = 0;
+
+	RETURN(rc);
+}
+
 /**
  * Object updates between Targets. Because all the updates has been
  * dis-assemblied into object updates at sender side, so OUT will
@@ -1220,50 +1465,49 @@ int out_handle(struct tgt_session_info *tsi)
 	struct thandle_exec_args	*ta = &tti->tti_tea;
 	struct req_capsule		*pill = tsi->tsi_pill;
 	struct dt_device		*dt = tsi->tsi_tgt->lut_bottom;
-	struct update_buf		*ubuf;
-	struct update			*update;
-	struct update_reply		*update_reply;
+	struct object_update_request	*ureq;
+	struct object_update		*update;
+	struct object_update_reply	*reply;
 	int				 bufsize;
 	int				 count;
-	int				 old_batchid = -1;
-	unsigned			 off;
+	int				 current_batchid = -1;
 	int				 i;
 	int				 rc = 0;
 	int				 rc1 = 0;
 
 	ENTRY;
 
-	req_capsule_set(pill, &RQF_UPDATE_OBJ);
-	bufsize = req_capsule_get_size(pill, &RMF_UPDATE, RCL_CLIENT);
-	if (bufsize != UPDATE_BUFFER_SIZE) {
-		CERROR("%s: invalid bufsize %d: rc = %d\n",
-		       tgt_name(tsi->tsi_tgt), bufsize, -EPROTO);
+	req_capsule_set(pill, &RQF_OUT_UPDATE);
+	ureq = req_capsule_client_get(pill, &RMF_OUT_UPDATE);
+	if (ureq == NULL) {
+		CERROR("%s: No buf!: rc = %d\n", tgt_name(tsi->tsi_tgt),
+		       -EPROTO);
 		RETURN(err_serious(-EPROTO));
 	}
 
-	ubuf = req_capsule_client_get(pill, &RMF_UPDATE);
-	if (ubuf == NULL) {
-		CERROR("%s: No buf!: rc = %d\n", tgt_name(tsi->tsi_tgt),
-		       -EPROTO);
+	bufsize = req_capsule_get_size(pill, &RMF_OUT_UPDATE, RCL_CLIENT);
+	if (bufsize != object_update_request_size(ureq)) {
+		CERROR("%s: invalid bufsize %d: rc = %d\n",
+		       tgt_name(tsi->tsi_tgt), bufsize, -EPROTO);
 		RETURN(err_serious(-EPROTO));
 	}
 
-	if (ubuf->ub_magic != UPDATE_BUFFER_MAGIC) {
-		CERROR("%s: invalid magic %x expect %x: rc = %d\n",
-		       tgt_name(tsi->tsi_tgt), ubuf->ub_magic,
-		       UPDATE_BUFFER_MAGIC, -EPROTO);
+	if (ureq->ourq_magic != UPDATE_REQUEST_MAGIC) {
+		CERROR("%s: invalid update buffer magic %x expect %x: "
+		       "rc = %d\n", tgt_name(tsi->tsi_tgt), ureq->ourq_magic,
+		       UPDATE_REQUEST_MAGIC, -EPROTO);
 		RETURN(err_serious(-EPROTO));
 	}
 
-	count = ubuf->ub_count;
+	count = ureq->ourq_count;
 	if (count <= 0) {
-		CERROR("%s: No update!: rc = %d\n",
-		       tgt_name(tsi->tsi_tgt), -EPROTO);
+		CERROR("%s: empty update: rc = %d\n", tgt_name(tsi->tsi_tgt),
+		       -EPROTO);
 		RETURN(err_serious(-EPROTO));
 	}
 
-	req_capsule_set_size(pill, &RMF_UPDATE_REPLY, RCL_SERVER,
-			     UPDATE_BUFFER_SIZE);
+	req_capsule_set_size(pill, &RMF_OUT_UPDATE_REPLY, RCL_SERVER,
+			     OUT_UPDATE_REPLY_SIZE);
 	rc = req_capsule_server_pack(pill);
 	if (rc != 0) {
 		CERROR("%s: Can't pack response: rc = %d\n",
@@ -1272,49 +1516,33 @@ int out_handle(struct tgt_session_info *tsi)
 	}
 
 	/* Prepare the update reply buffer */
-	update_reply = req_capsule_server_get(pill, &RMF_UPDATE_REPLY);
-	if (update_reply == NULL)
+	reply = req_capsule_server_get(pill, &RMF_OUT_UPDATE_REPLY);
+	if (reply == NULL)
 		RETURN(err_serious(-EPROTO));
-	update_init_reply_buf(update_reply, count);
-	tti->tti_u.update.tti_update_reply = update_reply;
-
-	rc = out_tx_start(env, dt, ta, tsi->tsi_exp);
-	if (rc != 0)
-		RETURN(rc);
-
+	object_update_reply_init(reply, count);
+	tti->tti_u.update.tti_update_reply = reply;
 	tti->tti_mult_trans = !req_is_replay(tgt_ses_req(tsi));
 
 	/* Walk through updates in the request to execute them synchronously */
-	off = cfs_size_round(offsetof(struct update_buf, ub_bufs[0]));
 	for (i = 0; i < count; i++) {
 		struct tgt_handler	*h;
 		struct dt_object	*dt_obj;
 
-		update = (struct update *)((char *)ubuf + off);
-		if (old_batchid == -1) {
-			old_batchid = update->u_batchid;
-		} else if (old_batchid != update->u_batchid) {
-			/* Stop the current update transaction,
-			 * create a new one */
-			rc = out_tx_end(env, ta);
-			if (rc != 0)
-				RETURN(rc);
+		update = object_update_request_get(ureq, i, NULL);
+		if (update == NULL)
+			GOTO(out, rc = -EPROTO);
 
-			rc = out_tx_start(env, dt, ta, tsi->tsi_exp);
-			if (rc != 0)
-				RETURN(rc);
-			old_batchid = update->u_batchid;
-		}
+		if (ptlrpc_req_need_swab(pill->rc_req))
+			lustre_swab_object_update(update);
 
-		fid_le_to_cpu(&update->u_fid, &update->u_fid);
-		if (!fid_is_sane(&update->u_fid)) {
+		if (!fid_is_sane(&update->ou_fid)) {
 			CERROR("%s: invalid FID "DFID": rc = %d\n",
-			       tgt_name(tsi->tsi_tgt), PFID(&update->u_fid),
+			       tgt_name(tsi->tsi_tgt), PFID(&update->ou_fid),
 			       -EPROTO);
 			GOTO(out, rc = err_serious(-EPROTO));
 		}
 
-		dt_obj = dt_locate(env, dt, &update->u_fid);
+		dt_obj = dt_locate(env, dt, &update->ou_fid);
 		if (IS_ERR(dt_obj))
 			GOTO(out, rc = PTR_ERR(dt_obj));
 
@@ -1328,41 +1556,67 @@ int out_handle(struct tgt_session_info *tsi)
 		tti->tti_u.update.tti_update = update;
 		tti->tti_u.update.tti_update_reply_index = i;
 
-		h = out_handler_find(update->u_type);
-		if (likely(h != NULL)) {
-			/* For real modification RPC, check if the update
-			 * has been executed */
-			if (h->th_flags & MUTABOR) {
-				struct ptlrpc_request *req = tgt_ses_req(tsi);
+		h = out_handler_find(update->ou_type);
+		if (unlikely(h == NULL)) {
+			CERROR("%s: unsupported opc: 0x%x\n",
+			       tgt_name(tsi->tsi_tgt), update->ou_type);
+			GOTO(next, rc = -ENOTSUPP);
+		}
+
+		/* Check resend case only for modifying RPC */
+		if (h->th_flags & MUTABOR) {
+			struct ptlrpc_request *req = tgt_ses_req(tsi);
+
+			if (out_check_resent(env, dt, dt_obj, req,
+					     out_reconstruct, reply, i))
+				GOTO(next, rc = 0);
+		}
+
+		/* start transaction for modification RPC only */
+		if (h->th_flags & MUTABOR && current_batchid == -1) {
+			current_batchid = update->ou_batchid;
+			rc = out_tx_start(env, dt, ta, tsi->tsi_exp);
+			if (rc != 0)
+				GOTO(next, rc);
+		}
+
+		/* Stop the current update transaction, if the update has
+		 * different batchid, or read-only update */
+		if (((current_batchid != update->ou_batchid) ||
+		     !(h->th_flags & MUTABOR)) && ta->ta_handle != NULL) {
+			rc = out_tx_end(env, ta, rc);
+			current_batchid = -1;
+			if (rc != 0)
+				GOTO(next, rc);
 
-				if (out_check_resent(env, dt, dt_obj, req,
-						     out_reconstruct,
-						     update_reply, i))
+			/* start a new transaction if needed */
+			if (h->th_flags & MUTABOR) {
+				rc = out_tx_start(env, dt, ta, tsi->tsi_exp);
+				if (rc != 0)
 					GOTO(next, rc);
-			}
 
-			rc = h->th_act(tsi);
-		} else {
-			CERROR("%s: The unsupported opc: 0x%x\n",
-			       tgt_name(tsi->tsi_tgt), update->u_type);
-			lu_object_put(env, &dt_obj->do_lu);
-			GOTO(out, rc = -ENOTSUPP);
+				current_batchid = update->ou_batchid;
+			}
 		}
+
+		rc = h->th_act(tsi);
 next:
 		lu_object_put(env, &dt_obj->do_lu);
 		if (rc < 0)
 			GOTO(out, rc);
-		off += update_size(update);
 	}
 out:
-	rc1 = out_tx_end(env, ta);
-	if (rc == 0)
-		rc = rc1;
+	if (current_batchid != -1) {
+		rc1 = out_tx_end(env, ta, rc);
+		if (rc == 0)
+			rc = rc1;
+	}
+
 	RETURN(rc);
 }
 
 struct tgt_handler tgt_out_handlers[] = {
-TGT_UPDATE_HDL(MUTABOR,	UPDATE_OBJ,	out_handle),
+TGT_UPDATE_HDL(MUTABOR,	OUT_UPDATE,	out_handle),
 };
 EXPORT_SYMBOL(tgt_out_handlers);