Whamcloud - gitweb
LU-3540 lod: update recovery thread
[fs/lustre-release.git] / lustre / target / out_handler.c
index 51bdd93..11dc864 100644 (file)
@@ -20,7 +20,7 @@
  * GPL HEADER END
  */
 /*
- * Copyright (c) 2013, Intel Corporation.
+ * Copyright (c) 2013, 2014, Intel Corporation.
  *
  * lustre/target/out_handler.c
  *
 #include "tgt_internal.h"
 #include <lustre_update.h>
 
-static int tx_extend_args(struct thandle_exec_args *ta, int new_alloc_ta)
-{
-       struct tx_arg   **new_ta;
-       int             i;
-       int             rc = 0;
-
-       if (ta->ta_alloc_args >= new_alloc_ta)
-               return 0;
-
-       OBD_ALLOC(new_ta, sizeof(*new_ta) * new_alloc_ta);
-       if (new_ta == NULL)
-               return -ENOMEM;
-
-       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);
-               }
-       }
-
-       /* free the old args */
-       if (ta->ta_args != NULL)
-               OBD_FREE(ta->ta_args, sizeof(ta->ta_args[0]) *
-                                     ta->ta_alloc_args);
-
-       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;
-}
-
-#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)
-{
-       int rc;
-       int i;
-
-       LASSERT(ta != NULL);
-       LASSERT(func != NULL);
-
-       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);
-       }
-
-       i = ta->ta_argno;
-
-       ta->ta_argno++;
-
-       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 ta->ta_args[i];
-}
-
 static void out_reconstruct(const struct lu_env *env, struct dt_device *dt,
                            struct dt_object *obj,
                            struct object_update_reply *reply,
@@ -137,6 +66,22 @@ static inline int out_check_resent(const struct lu_env *env,
                return 0;
 
        if (req_xid_is_last(req)) {
+               struct lsd_client_data *lcd;
+
+               /* XXX this does not support mulitple transactions yet, i.e.
+                * only 1 update RPC each time betwee MDTs */
+               lcd = req->rq_export->exp_target_data.ted_lcd;
+
+               req->rq_transno = lcd->lcd_last_transno;
+               req->rq_status = lcd->lcd_last_result;
+               if (req->rq_status != 0)
+                       req->rq_transno = 0;
+               lustre_msg_set_transno(req->rq_repmsg, req->rq_transno);
+               lustre_msg_set_status(req->rq_repmsg, req->rq_status);
+
+               DEBUG_REQ(D_RPCTRACE, req, "restoring transno "LPD64"status %d",
+                         req->rq_transno, req->rq_status);
+
                reconstruct(env, dt, obj, reply, index);
                return 1;
        }
@@ -145,101 +90,6 @@ static inline int out_check_resent(const struct lu_env *env,
        return 0;
 }
 
-static int out_obj_destroy(const struct lu_env *env, struct dt_object *dt_obj,
-                          struct thandle *th)
-{
-       int rc;
-
-       CDEBUG(D_INFO, "%s: destroy "DFID"\n", dt_obd_name(th->th_dev),
-              PFID(lu_object_fid(&dt_obj->do_lu)));
-
-       dt_write_lock(env, dt_obj, MOR_TGT_CHILD);
-       rc = dt_destroy(env, dt_obj, th);
-       dt_write_unlock(env, dt_obj);
-
-       return rc;
-}
-
-/**
- * All of the xxx_undo will be used once execution failed,
- * But because all of the required resource has been reserved in
- * declare phase, i.e. if declare succeed, it should make sure
- * the following executing phase succeed in anyway, so these undo
- * should be useless for most of the time in Phase I
- */
-int out_tx_create_undo(const struct lu_env *env, struct thandle *th,
-                      struct tx_arg *arg)
-{
-       int rc;
-
-       rc = out_obj_destroy(env, arg->object, th);
-       if (rc != 0)
-               CERROR("%s: undo failure, we are doomed!: rc = %d\n",
-                      dt_obd_name(th->th_dev), rc);
-       return rc;
-}
-
-int out_tx_create_exec(const struct lu_env *env, struct thandle *th,
-                      struct tx_arg *arg)
-{
-       struct dt_object        *dt_obj = arg->object;
-       int                      rc;
-
-       CDEBUG(D_OTHER, "%s: create "DFID": dof %u, mode %o\n",
-              dt_obd_name(th->th_dev),
-              PFID(lu_object_fid(&arg->object->do_lu)),
-              arg->u.create.dof.dof_type,
-              arg->u.create.attr.la_mode & S_IFMT);
-
-       dt_write_lock(env, dt_obj, MOR_TGT_CHILD);
-       rc = dt_create(env, dt_obj, &arg->u.create.attr,
-                      &arg->u.create.hint, &arg->u.create.dof, th);
-
-       dt_write_unlock(env, dt_obj);
-
-       CDEBUG(D_INFO, "%s: insert create 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_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 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_create(env, obj, attr, NULL, dof,
-                                      ta->ta_handle);
-       if (rc != 0)
-               return rc;
-
-       arg = tx_add_exec(ta, out_tx_create_exec, out_tx_create_undo, file,
-                         line);
-       if (IS_ERR(arg))
-               return PTR_ERR(arg);
-
-       /* release the object in out_trans_stop */
-       lu_object_get(&obj->do_lu);
-       arg->object = obj;
-       arg->u.create.attr = *attr;
-       if (parent_fid != NULL)
-               arg->u.create.fid = *parent_fid;
-       memset(&arg->u.create.hint, 0, sizeof(arg->u.create.hint));
-       arg->u.create.dof  = *dof;
-       arg->reply = reply;
-       arg->index = index;
-
-       return 0;
-}
-
 static int out_create(struct tgt_session_info *tsi)
 {
        struct tgt_thread_info  *tti = tgt_th_info(tsi->tsi_env);
@@ -256,7 +106,7 @@ static int out_create(struct tgt_session_info *tsi)
        ENTRY;
 
        wobdo = object_update_param_get(update, 0, &size);
-       if (wobdo == NULL || size != sizeof(*wobdo)) {
+       if (wobdo == NULL || IS_ERR(wobdo) || size != sizeof(*wobdo)) {
                CERROR("%s: obdo is NULL, invalid RPC: rc = %d\n",
                       tgt_name(tsi->tsi_tgt), -EPROTO);
                RETURN(err_serious(-EPROTO));
@@ -270,7 +120,7 @@ static int out_create(struct tgt_session_info *tsi)
        dof->dof_type = dt_mode_to_dft(attr->la_mode);
        if (update->ou_params_count > 1) {
                fid = object_update_param_get(update, 1, &size);
-               if (fid == NULL || size != sizeof(*fid)) {
+               if (fid == NULL || IS_ERR(fid) || size != sizeof(*fid)) {
                        CERROR("%s: invalid fid: rc = %d\n",
                               tgt_name(tsi->tsi_tgt), -EPROTO);
                        RETURN(err_serious(-EPROTO));
@@ -288,72 +138,13 @@ static int out_create(struct tgt_session_info *tsi)
                RETURN(-EEXIST);
 
        rc = out_tx_create(tsi->tsi_env, obj, attr, fid, dof,
-                          &tti->tti_tea,
+                          &tti->tti_tea, tti->tti_tea.ta_handle,
                           tti->tti_u.update.tti_update_reply,
                           tti->tti_u.update.tti_update_reply_index);
 
        RETURN(rc);
 }
 
-static int out_tx_attr_set_undo(const struct lu_env *env,
-                               struct thandle *th, struct tx_arg *arg)
-{
-       CERROR("%s: attr set undo "DFID" unimplemented yet!: rc = %d\n",
-              dt_obd_name(th->th_dev),
-              PFID(lu_object_fid(&arg->object->do_lu)), -ENOTSUPP);
-
-       return -ENOTSUPP;
-}
-
-static int out_tx_attr_set_exec(const struct lu_env *env, struct thandle *th,
-                               struct tx_arg *arg)
-{
-       struct dt_object        *dt_obj = arg->object;
-       int                     rc;
-
-       CDEBUG(D_OTHER, "%s: attr set "DFID"\n", dt_obd_name(th->th_dev),
-              PFID(lu_object_fid(&dt_obj->do_lu)));
-
-       dt_write_lock(env, dt_obj, MOR_TGT_CHILD);
-       rc = dt_attr_set(env, dt_obj, &arg->u.attr_set.attr, th, NULL);
-       dt_write_unlock(env, dt_obj);
-
-       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);
-
-       object_update_result_insert(arg->reply, NULL, 0, arg->index, rc);
-
-       return rc;
-}
-
-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 object_update_reply *reply,
-                            int index, const char *file, int line)
-{
-       struct tx_arg   *arg;
-       int             rc;
-
-       LASSERT(th->ta_handle != NULL);
-       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);
-       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;
-       arg->reply = reply;
-       arg->index = index;
-       return 0;
-}
-
 static int out_attr_set(struct tgt_session_info *tsi)
 {
        struct tgt_thread_info  *tti = tgt_th_info(tsi->tsi_env);
@@ -368,7 +159,7 @@ static int out_attr_set(struct tgt_session_info *tsi)
        ENTRY;
 
        wobdo = object_update_param_get(update, 0, &size);
-       if (wobdo == NULL || size != sizeof(*wobdo)) {
+       if (wobdo == NULL || IS_ERR(wobdo) || size != sizeof(*wobdo)) {
                CERROR("%s: empty obdo in the update: rc = %d\n",
                       tgt_name(tsi->tsi_tgt), -EPROTO);
                RETURN(err_serious(-EPROTO));
@@ -383,6 +174,7 @@ static int out_attr_set(struct tgt_session_info *tsi)
        la_from_obdo(attr, lobdo, lobdo->o_valid);
 
        rc = out_tx_attr_set(tsi->tsi_env, obj, attr, &tti->tti_tea,
+                            tti->tti_tea.ta_handle,
                             tti->tti_u.update.tti_update_reply,
                             tti->tti_u.update.tti_update_reply_index);
 
@@ -412,7 +204,7 @@ static int out_attr_get(struct tgt_session_info *tsi)
        }
 
        dt_read_lock(env, obj, MOR_TGT_CHILD);
-       rc = dt_attr_get(env, obj, la, NULL);
+       rc = dt_attr_get(env, obj, la);
        if (rc)
                GOTO(out_unlock, rc);
 
@@ -455,7 +247,7 @@ static int out_xattr_get(struct tgt_session_info *tsi)
        }
 
        name = object_update_param_get(update, 0, NULL);
-       if (name == NULL) {
+       if (name == NULL || IS_ERR(name)) {
                CERROR("%s: empty name for xattr get: rc = %d\n",
                       tgt_name(tsi->tsi_tgt), -EPROTO);
                RETURN(err_serious(-EPROTO));
@@ -473,16 +265,12 @@ static int out_xattr_get(struct tgt_session_info *tsi)
                       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);
+       rc = dt_xattr_get(env, obj, lbuf, name);
        dt_read_unlock(env, obj);
        if (rc < 0) {
                lbuf->lb_len = 0;
                GOTO(out, rc);
        }
-       if (rc == 0) {
-               lbuf->lb_len = 0;
-               GOTO(out, rc = -ENOENT);
-       }
        lbuf->lb_len = rc;
        rc = 0;
        CDEBUG(D_INFO, "%s: "DFID" get xattr %s len %d\n",
@@ -511,7 +299,7 @@ static int out_index_lookup(struct tgt_session_info *tsi)
                RETURN(-ENOENT);
 
        name = object_update_param_get(update, 0, NULL);
-       if (name == NULL) {
+       if (name == NULL || IS_ERR(name)) {
                CERROR("%s: empty name for lookup: rc = %d\n",
                       tgt_name(tsi->tsi_tgt), -EPROTO);
                RETURN(err_serious(-EPROTO));
@@ -522,7 +310,7 @@ static int out_index_lookup(struct tgt_session_info *tsi)
                GOTO(out_unlock, rc = -ENOTDIR);
 
        rc = dt_lookup(env, obj, (struct dt_rec *)&tti->tti_fid1,
-               (struct dt_key *)name, NULL);
+                      (struct dt_key *)name);
 
        if (rc < 0)
                GOTO(out_unlock, rc);
@@ -547,70 +335,6 @@ out_unlock:
        RETURN(rc);
 }
 
-static int out_tx_xattr_set_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: set xattr buf %p name %s flag %d\n",
-              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,
-                         th, NULL);
-       dt_write_unlock(env, dt_obj);
-       /**
-        * Ignore errors if this is LINK EA
-        **/
-       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);
-
-       object_update_result_insert(arg->reply, NULL, 0, arg->index, rc);
-
-       return rc;
-}
-
-static int __out_tx_xattr_set(const struct lu_env *env,
-                             struct dt_object *dt_obj,
-                             const struct lu_buf *buf,
-                             const char *name, int flags,
-                             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_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);
-       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->u.xattr_set.flags = flags;
-       arg->u.xattr_set.buf = *buf;
-       arg->reply = reply;
-       arg->index = index;
-       arg->u.xattr_set.csum = 0;
-       return 0;
-}
-
 static int out_xattr_set(struct tgt_session_info *tsi)
 {
        struct tgt_thread_info  *tti = tgt_th_info(tsi->tsi_env);
@@ -627,25 +351,22 @@ static int out_xattr_set(struct tgt_session_info *tsi)
        ENTRY;
 
        name = object_update_param_get(update, 0, NULL);
-       if (name == NULL) {
+       if (name == NULL || IS_ERR(name)) {
                CERROR("%s: empty name for xattr set: rc = %d\n",
                       tgt_name(tsi->tsi_tgt), -EPROTO);
                RETURN(err_serious(-EPROTO));
        }
 
        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);
+       if (IS_ERR(buf))
                RETURN(err_serious(-EPROTO));
-       }
 
        lbuf->lb_buf = buf;
        lbuf->lb_len = buf_len;
 
        tmp = object_update_param_get(update, 2, &size);
        if (tmp == NULL || size != sizeof(*tmp)) {
-               CERROR("%s: emptry or wrong size %zd flag: rc = %d\n",
+               CERROR("%s: emptry or wrong size %zu flag: rc = %d\n",
                       tgt_name(tsi->tsi_tgt), size, -EPROTO);
                RETURN(err_serious(-EPROTO));
        }
@@ -655,63 +376,12 @@ static int out_xattr_set(struct tgt_session_info *tsi)
        flag = *tmp;
 
        rc = out_tx_xattr_set(tsi->tsi_env, obj, lbuf, name, flag,
-                             &tti->tti_tea,
+                             &tti->tti_tea, tti->tti_tea.ta_handle,
                              tti->tti_u.update.tti_update_reply,
                              tti->tti_u.update.tti_update_reply_index);
        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);
@@ -722,91 +392,19 @@ static int out_xattr_del(struct tgt_session_info *tsi)
        ENTRY;
 
        name = object_update_param_get(update, 0, NULL);
-       if (name == NULL) {
+       if (name == NULL || IS_ERR(name)) {
                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_tea.ta_handle,
                              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)
-{
-       int rc;
-
-       dt_write_lock(env, dt_obj, MOR_TGT_CHILD);
-       rc = dt_ref_add(env, dt_obj, th);
-       dt_write_unlock(env, dt_obj);
-
-       return rc;
-}
-
-static int out_obj_ref_del(const struct lu_env *env,
-                          struct dt_object *dt_obj,
-                          struct thandle *th)
-{
-       int rc;
-
-       dt_write_lock(env, dt_obj, MOR_TGT_CHILD);
-       rc = dt_ref_del(env, dt_obj, th);
-       dt_write_unlock(env, dt_obj);
-
-       return rc;
-}
-
-static int out_tx_ref_add_exec(const struct lu_env *env, struct thandle *th,
-                              struct tx_arg *arg)
-{
-       struct dt_object *dt_obj = arg->object;
-       int rc;
-
-       rc = out_obj_ref_add(env, dt_obj, 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);
-
-       object_update_result_insert(arg->reply, NULL, 0, arg->index, rc);
-       return rc;
-}
-
-static int out_tx_ref_add_undo(const struct lu_env *env, struct thandle *th,
-                              struct tx_arg *arg)
-{
-       return out_obj_ref_del(env, arg->object, th);
-}
-
-static int __out_tx_ref_add(const struct lu_env *env,
-                           struct dt_object *dt_obj,
-                           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_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);
-       if (IS_ERR(arg))
-               return PTR_ERR(arg);
-
-       lu_object_get(&dt_obj->do_lu);
-       arg->object = dt_obj;
-       arg->reply = reply;
-       arg->index = index;
-       return 0;
-}
-
 /**
  * increase ref of the object
  **/
@@ -819,59 +417,12 @@ static int out_ref_add(struct tgt_session_info *tsi)
        ENTRY;
 
        rc = out_tx_ref_add(tsi->tsi_env, obj, &tti->tti_tea,
+                           tti->tti_tea.ta_handle,
                            tti->tti_u.update.tti_update_reply,
                            tti->tti_u.update.tti_update_reply_index);
        RETURN(rc);
 }
 
-static int out_tx_ref_del_exec(const struct lu_env *env, struct thandle *th,
-                              struct tx_arg *arg)
-{
-       struct dt_object        *dt_obj = arg->object;
-       int                      rc;
-
-       rc = out_obj_ref_del(env, dt_obj, 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);
-
-       object_update_result_insert(arg->reply, NULL, 0, arg->index, rc);
-
-       return rc;
-}
-
-static int out_tx_ref_del_undo(const struct lu_env *env, struct thandle *th,
-                              struct tx_arg *arg)
-{
-       return out_obj_ref_add(env, arg->object, th);
-}
-
-static int __out_tx_ref_del(const struct lu_env *env,
-                           struct dt_object *dt_obj,
-                           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_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);
-       if (IS_ERR(arg))
-               return PTR_ERR(arg);
-
-       lu_object_get(&dt_obj->do_lu);
-       arg->object = dt_obj;
-       arg->reply = reply;
-       arg->index = index;
-       return 0;
-}
-
 static int out_ref_del(struct tgt_session_info *tsi)
 {
        struct tgt_thread_info  *tti = tgt_th_info(tsi->tsi_env);
@@ -884,115 +435,12 @@ static int out_ref_del(struct tgt_session_info *tsi)
                RETURN(-ENOENT);
 
        rc = out_tx_ref_del(tsi->tsi_env, obj, &tti->tti_tea,
+                           tti->tti_tea.ta_handle,
                            tti->tti_u.update.tti_update_reply,
                            tti->tti_u.update.tti_update_reply_index);
        RETURN(rc);
 }
 
-static int out_obj_index_insert(const struct lu_env *env,
-                               struct dt_object *dt_obj,
-                               const struct dt_rec *rec,
-                               const struct dt_key *key,
-                               struct thandle *th)
-{
-       int rc;
-
-       CDEBUG(D_INFO, "%s: index insert "DFID" name: %s fid "DFID", type %u\n",
-              dt_obd_name(th->th_dev), PFID(lu_object_fid(&dt_obj->do_lu)),
-              (char *)key, PFID(((struct dt_insert_rec *)rec)->rec_fid),
-              ((struct dt_insert_rec *)rec)->rec_type);
-
-       if (dt_try_as_dir(env, dt_obj) == 0)
-               return -ENOTDIR;
-
-       dt_write_lock(env, dt_obj, MOR_TGT_CHILD);
-       rc = dt_insert(env, dt_obj, rec, key, th, NULL, 0);
-       dt_write_unlock(env, dt_obj);
-
-       return rc;
-}
-
-static int out_obj_index_delete(const struct lu_env *env,
-                               struct dt_object *dt_obj,
-                               const struct dt_key *key,
-                               struct thandle *th)
-{
-       int rc;
-
-       CDEBUG(D_INFO, "%s: index delete "DFID" name: %s\n",
-              dt_obd_name(th->th_dev), PFID(lu_object_fid(&dt_obj->do_lu)),
-              (char *)key);
-
-       if (dt_try_as_dir(env, dt_obj) == 0)
-               return -ENOTDIR;
-
-       dt_write_lock(env, dt_obj, MOR_TGT_CHILD);
-       rc = dt_delete(env, dt_obj, key, th, NULL);
-       dt_write_unlock(env, dt_obj);
-
-       return rc;
-}
-
-static int out_tx_index_insert_exec(const struct lu_env *env,
-                                   struct thandle *th, struct tx_arg *arg)
-{
-       struct dt_object *dt_obj = arg->object;
-       int rc;
-
-       rc = out_obj_index_insert(env, dt_obj,
-                                 (const struct dt_rec *)&arg->u.insert.rec,
-                                 arg->u.insert.key, th);
-
-       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);
-
-       object_update_result_insert(arg->reply, NULL, 0, arg->index, rc);
-
-       return rc;
-}
-
-static int out_tx_index_insert_undo(const struct lu_env *env,
-                                   struct thandle *th, struct tx_arg *arg)
-{
-       return out_obj_index_delete(env, arg->object, arg->u.insert.key, th);
-}
-
-static int __out_tx_index_insert(const struct lu_env *env,
-                                struct dt_object *dt_obj,
-                                const struct dt_rec *rec,
-                                const struct dt_key *key,
-                                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);
-       if (dt_try_as_dir(env, dt_obj) == 0) {
-               rc = -ENOTDIR;
-               return rc;
-       }
-
-       rc = dt_declare_insert(env, dt_obj, rec, key, 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);
-       if (IS_ERR(arg))
-               return PTR_ERR(arg);
-
-       lu_object_get(&dt_obj->do_lu);
-       arg->object = dt_obj;
-       arg->reply = reply;
-       arg->index = index;
-       arg->u.insert.rec = *(const struct dt_insert_rec *)rec;
-       arg->u.insert.key = key;
-
-       return 0;
-}
-
 static int out_index_insert(struct tgt_session_info *tsi)
 {
        struct tgt_thread_info  *tti    = tgt_th_info(tsi->tsi_env);
@@ -1007,17 +455,17 @@ static int out_index_insert(struct tgt_session_info *tsi)
        ENTRY;
 
        name = object_update_param_get(update, 0, NULL);
-       if (name == NULL) {
+       if (name == NULL || IS_ERR(name)) {
                CERROR("%s: empty name for index insert: rc = %d\n",
                       tgt_name(tsi->tsi_tgt), -EPROTO);
                RETURN(err_serious(-EPROTO));
        }
 
        fid = object_update_param_get(update, 1, &size);
-       if (fid == NULL || size != sizeof(*fid)) {
+       if (fid == NULL || IS_ERR(fid) || size != sizeof(*fid)) {
                CERROR("%s: invalid fid: rc = %d\n",
                       tgt_name(tsi->tsi_tgt), -EPROTO);
-                      RETURN(err_serious(-EPROTO));
+               RETURN(err_serious(-EPROTO));
        }
 
        if (ptlrpc_req_need_swab(tsi->tsi_pill->rc_req))
@@ -1030,7 +478,7 @@ static int out_index_insert(struct tgt_session_info *tsi)
        }
 
        ptype = object_update_param_get(update, 2, &size);
-       if (ptype == NULL || size != sizeof(*ptype)) {
+       if (ptype == NULL || IS_ERR(ptype) || size != sizeof(*ptype)) {
                CERROR("%s: invalid type for index insert: rc = %d\n",
                       tgt_name(tsi->tsi_tgt), -EPROTO);
                RETURN(err_serious(-EPROTO));
@@ -1044,69 +492,12 @@ static int out_index_insert(struct tgt_session_info *tsi)
 
        rc = out_tx_index_insert(tsi->tsi_env, obj, (const struct dt_rec *)rec,
                                 (const struct dt_key *)name, &tti->tti_tea,
+                                tti->tti_tea.ta_handle,
                                 tti->tti_u.update.tti_update_reply,
                                 tti->tti_u.update.tti_update_reply_index);
        RETURN(rc);
 }
 
-static int out_tx_index_delete_exec(const struct lu_env *env,
-                                   struct thandle *th,
-                                   struct tx_arg *arg)
-{
-       int rc;
-
-       rc = out_obj_index_delete(env, arg->object, arg->u.insert.key, th);
-
-       CDEBUG(D_INFO, "%s: delete idx insert 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_index_delete_undo(const struct lu_env *env,
-                                   struct thandle *th,
-                                   struct tx_arg *arg)
-{
-       CERROR("%s: Oops, can not rollback index_delete yet: rc = %d\n",
-              dt_obd_name(th->th_dev), -ENOTSUPP);
-       return -ENOTSUPP;
-}
-
-static int __out_tx_index_delete(const struct lu_env *env,
-                                struct dt_object *dt_obj,
-                                const struct dt_key *key,
-                                struct thandle_exec_args *ta,
-                                struct object_update_reply *reply,
-                                int index, const char *file, int line)
-{
-       struct tx_arg   *arg;
-       int             rc;
-
-       if (dt_try_as_dir(env, dt_obj) == 0) {
-               rc = -ENOTDIR;
-               return rc;
-       }
-
-       LASSERT(ta->ta_handle != NULL);
-       rc = dt_declare_delete(env, dt_obj, key, 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);
-       if (IS_ERR(arg))
-               return PTR_ERR(arg);
-
-       lu_object_get(&dt_obj->do_lu);
-       arg->object = dt_obj;
-       arg->reply = reply;
-       arg->index = index;
-       arg->u.insert.key = key;
-       return 0;
-}
-
 static int out_index_delete(struct tgt_session_info *tsi)
 {
        struct tgt_thread_info  *tti = tgt_th_info(tsi->tsi_env);
@@ -1119,68 +510,19 @@ static int out_index_delete(struct tgt_session_info *tsi)
                RETURN(-ENOENT);
 
        name = object_update_param_get(update, 0, NULL);
-       if (name == NULL) {
+       if (name == NULL || IS_ERR(name)) {
                CERROR("%s: empty name for index delete: rc = %d\n",
                       tgt_name(tsi->tsi_tgt), -EPROTO);
                RETURN(err_serious(-EPROTO));
        }
 
        rc = out_tx_index_delete(tsi->tsi_env, obj, (const struct dt_key *)name,
-                                &tti->tti_tea,
+                                &tti->tti_tea, tti->tti_tea.ta_handle,
                                 tti->tti_u.update.tti_update_reply,
                                 tti->tti_u.update.tti_update_reply_index);
        RETURN(rc);
 }
 
-static int out_tx_destroy_exec(const struct lu_env *env, struct thandle *th,
-                              struct tx_arg *arg)
-{
-       struct dt_object *dt_obj = arg->object;
-       int rc;
-
-       rc = out_obj_destroy(env, dt_obj, 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);
-
-       object_update_result_insert(arg->reply, NULL, 0, arg->index, rc);
-
-       RETURN(rc);
-}
-
-static int out_tx_destroy_undo(const struct lu_env *env, struct thandle *th,
-                              struct tx_arg *arg)
-{
-       CERROR("%s: not support destroy undo yet!: rc = %d\n",
-              dt_obd_name(th->th_dev), -ENOTSUPP);
-       return -ENOTSUPP;
-}
-
-static int __out_tx_destroy(const struct lu_env *env, struct dt_object *dt_obj,
-                            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_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);
-       if (IS_ERR(arg))
-               return PTR_ERR(arg);
-
-       lu_object_get(&dt_obj->do_lu);
-       arg->object = dt_obj;
-       arg->reply = reply;
-       arg->index = index;
-       return 0;
-}
-
 static int out_destroy(struct tgt_session_info *tsi)
 {
        struct tgt_thread_info  *tti = tgt_th_info(tsi->tsi_env);
@@ -1201,59 +543,13 @@ static int out_destroy(struct tgt_session_info *tsi)
                RETURN(-ENOENT);
 
        rc = out_tx_destroy(tsi->tsi_env, obj, &tti->tti_tea,
+                           tti->tti_tea.ta_handle,
                            tti->tti_u.update.tti_update_reply,
                            tti->tti_u.update.tti_update_reply_index);
 
        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);
@@ -1269,7 +565,7 @@ static int out_write(struct tgt_session_info *tsi)
        ENTRY;
 
        buf = object_update_param_get(update, 0, &buf_len);
-       if (buf == NULL || buf_len == 0) {
+       if (buf == NULL || IS_ERR(buf) || buf_len == 0) {
                CERROR("%s: empty buf for xattr set: rc = %d\n",
                       tgt_name(tsi->tsi_tgt), -EPROTO);
                RETURN(err_serious(-EPROTO));
@@ -1278,8 +574,8 @@ static int out_write(struct tgt_session_info *tsi)
        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 %zd pos: rc = %d\n",
+       if (tmp == NULL || IS_ERR(tmp) || size != sizeof(*tmp)) {
+               CERROR("%s: empty or wrong size %zu pos: rc = %d\n",
                       tgt_name(tsi->tsi_tgt), size, -EPROTO);
                RETURN(err_serious(-EPROTO));
        }
@@ -1289,12 +585,83 @@ static int out_write(struct tgt_session_info *tsi)
        pos = *tmp;
 
        rc = out_tx_write(tsi->tsi_env, obj, lbuf, pos,
-                         &tti->tti_tea,
+                         &tti->tti_tea, tti->tti_tea.ta_handle,
                          tti->tti_u.update.tti_update_reply,
                          tti->tti_u.update.tti_update_reply_index);
        RETURN(rc);
 }
 
+static int out_read(struct tgt_session_info *tsi)
+{
+       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 dt_object        *obj = tti->tti_u.update.tti_dt_object;
+       struct object_update_reply *reply = tti->tti_u.update.tti_update_reply;
+       int             index = tti->tti_u.update.tti_update_reply_index;
+       struct object_update_result *update_result;
+       struct lu_buf           *lbuf = &tti->tti_buf;
+       struct out_read_reply   *orr;
+       void                    *tmp;
+       size_t                  size;
+       __u64                   pos;
+       int                      rc;
+       ENTRY;
+
+       update_result = object_update_result_get(reply, index, NULL);
+       LASSERT(update_result != NULL);
+       update_result->our_datalen = sizeof(*orr);
+
+       if (!lu_object_exists(&obj->do_lu))
+               GOTO(out, rc = -ENOENT);
+
+       tmp = object_update_param_get(update, 0, NULL);
+       if (tmp == NULL) {
+               CERROR("%s: empty size for read: rc = %d\n",
+                      tgt_name(tsi->tsi_tgt), -EPROTO);
+               GOTO(out, rc = err_serious(-EPROTO));
+       }
+       size = le64_to_cpu(*(size_t *)(tmp));
+
+       tmp = object_update_param_get(update, 1, NULL);
+       if (tmp == NULL) {
+               CERROR("%s: empty pos for read: rc = %d\n",
+                      tgt_name(tsi->tsi_tgt), -EPROTO);
+               GOTO(out, rc = err_serious(-EPROTO));
+       }
+       pos = le64_to_cpu(*(__u64 *)(tmp));
+
+       if (size > OUT_UPDATE_REPLY_SIZE -
+                  cfs_size_round((unsigned long)update_result->our_data -
+                                 (unsigned long)update_result) - sizeof(pos)) {
+               CERROR("%s: get %zu the biggest read size is %d: rc = %d\n",
+                      tgt_name(tsi->tsi_tgt), size, OUT_UPDATE_REPLY_SIZE,
+                      -EPROTO);
+               GOTO(out, rc = err_serious(-EPROTO));
+       }
+
+       /* Put the offset into the begining of the buffer in reply */
+       orr = (struct out_read_reply *)update_result->our_data;
+
+       lbuf->lb_buf = orr->orr_data;
+       lbuf->lb_len = size;
+
+       dt_read_lock(env, obj, MOR_TGT_CHILD);
+       rc = dt_read(env, obj, lbuf, &pos);
+       dt_read_unlock(env, obj);
+       orr->orr_size = rc < 0 ? 0 : rc;
+       orr->orr_offset = pos;
+
+       orr_cpu_to_le(orr, orr);
+       update_result->our_datalen += orr->orr_size;
+out:
+       /* Insert read buffer */
+       update_result->our_rc = ptlrpc_status_hton(rc);
+       reply->ourp_lens[index] = cfs_size_round(update_result->our_datalen +
+                                                sizeof(*update_result));
+       RETURN(rc);
+}
+
 #define DEF_OUT_HNDL(opc, name, flags, fn)     \
 [opc - OUT_CREATE] = {                                 \
        .th_name    = name,                             \
@@ -1332,9 +699,11 @@ static struct tgt_handler out_update_ops[] = {
        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),
+       DEF_OUT_HNDL(OUT_READ, "out_read", HABEO_REFERO, out_read),
+
 };
 
-struct tgt_handler *out_handler_find(__u32 opc)
+static struct tgt_handler *out_handler_find(__u32 opc)
 {
        struct tgt_handler *h;
 
@@ -1405,8 +774,8 @@ static int out_trans_stop(const struct lu_env *env,
        return rc;
 }
 
-int out_tx_end(const struct lu_env *env, struct thandle_exec_args *ta,
-              int declare_ret)
+static 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;
@@ -1449,8 +818,13 @@ int out_tx_end(const struct lu_env *env, struct thandle_exec_args *ta,
                       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;
+       /* Only fail for real updates, XXX right now llog updates will be
+       * ignore, whose updates count is usually 1, so failover test
+       * case will spot this FAIL_UPDATE_NET_REP precisely, and it will
+       * be removed after async update patch is landed. */
+       if (ta->ta_argno > 1)
+               tsi->tsi_reply_fail_id = OBD_FAIL_OUT_UPDATE_NET_REP;
+
 stop:
        rc1 = out_trans_stop(env, ta, rc);
        if (rc == 0)
@@ -1563,8 +937,10 @@ int out_handle(struct tgt_session_info *tsi)
 
                if (dt->dd_record_fid_accessed) {
                        lfsck_pack_rfa(&tti->tti_lr,
-                                      lu_object_fid(&dt_obj->do_lu));
-                       tgt_lfsck_in_notify(env, dt, &tti->tti_lr);
+                                      lu_object_fid(&dt_obj->do_lu),
+                                      LE_FID_ACCESSED,
+                                      LFSCK_TYPE_LAYOUT);
+                       tgt_lfsck_in_notify(env, dt, &tti->tti_lr, NULL);
                }
 
                tti->tti_u.update.tti_dt_object = dt_obj;
@@ -1593,6 +969,9 @@ int out_handle(struct tgt_session_info *tsi)
                        rc = out_tx_start(env, dt, ta, tsi->tsi_exp);
                        if (rc != 0)
                                GOTO(next, rc);
+
+                       if (update->ou_flags & UPDATE_FL_SYNC)
+                               ta->ta_handle->th_sync = 1;
                }
 
                /* Stop the current update transaction, if the update has
@@ -1610,6 +989,9 @@ int out_handle(struct tgt_session_info *tsi)
                                if (rc != 0)
                                        GOTO(next, rc);
 
+                               if (update->ou_flags & UPDATE_FL_SYNC)
+                                       ta->ta_handle->th_sync = 1;
+
                                current_batchid = update->ou_batchid;
                        }
                }