Whamcloud - gitweb
Branch HEAD
[fs/lustre-release.git] / lustre / mdt / mdt_recovery.c
index 04376af..810d252 100644 (file)
@@ -1,31 +1,46 @@
 /* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
  * vim:expandtab:shiftwidth=8:tabstop=8:
  *
- *  linux/mdt/mdt_recovery.c
- *  Lustre Metadata Target (mdt) recovery-related methods
+ * GPL HEADER START
  *
- *  Copyright (C) 2002-2006 Cluster File Systems, Inc.
- *   Author: Huang Hua <huanghua@clusterfs.com>
- *   Author: Pershin Mike <tappro@clusterfs.com>
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *   This file is part of the Lustre file system, http://www.lustre.org
- *   Lustre is a trademark of Cluster File Systems, Inc.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 only,
+ * as published by the Free Software Foundation.
  *
- *   You may have signed or agreed to another license before downloading
- *   this software.  If so, you are bound by the terms and conditions
- *   of that agreement, and the following does not apply to you.  See the
- *   LICENSE file included with this distribution for more information.
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License version 2 for more details (a copy is included
+ * in the LICENSE file that accompanied this code).
  *
- *   If you did not agree to a different license, then this copy of Lustre
- *   is open source software; you can redistribute it and/or modify it
- *   under the terms of version 2 of the GNU General Public License as
- *   published by the Free Software Foundation.
+ * You should have received a copy of the GNU General Public License
+ * version 2 along with this program; If not, see
+ * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf
  *
- *   In either case, Lustre is distributed in the hope that it will be
- *   useful, but WITHOUT ANY WARRANTY; without even the implied warranty
- *   of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   license text for more details.
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ *
+ * GPL HEADER END
+ */
+/*
+ * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Use is subject to license terms.
+ */
+/*
+ * This file is part of Lustre, http://www.lustre.org/
+ * Lustre is a trademark of Sun Microsystems, Inc.
+ *
+ * lustre/mdt/mdt_recovery.c
+ *
+ * Lustre Metadata Target (mdt) recovery-related methods
+ *
+ * Author: Huang Hua <huanghua@clusterfs.com>
+ * Author: Pershin Mike <tappro@clusterfs.com>
  */
+
 #ifndef EXPORT_SYMTAB
 # define EXPORT_SYMTAB
 #endif
@@ -34,7 +49,8 @@
 #include "mdt_internal.h"
 
 static int mdt_server_data_update(const struct lu_env *env,
-                                  struct mdt_device *mdt);
+                                  struct mdt_device *mdt,
+                                  int need_sync);
 
 struct lu_buf *mdt_buf(const struct lu_env *env, void *area, ssize_t len)
 {
@@ -62,52 +78,48 @@ const struct lu_buf *mdt_buf_const(const struct lu_env *env,
         return buf;
 }
 
-int mdt_record_read(const struct lu_env *env,
-                    struct dt_object *dt, struct lu_buf *buf, loff_t *pos)
+static inline int mdt_trans_credit_get(const struct lu_env *env,
+                                       struct mdt_device *mdt,
+                                       enum mdt_txn_op op)
 {
-        int rc;
-
-        LASSERTF(dt != NULL, "dt is NULL when we want to read record\n");
-
-        rc = dt->do_body_ops->dbo_read(env, dt, buf, pos, BYPASS_CAPA);
-
-        if (rc == buf->lb_len)
-                rc = 0;
-        else if (rc >= 0)
-                rc = -EFAULT;
-        return rc;
+        struct dt_device *dev = mdt->mdt_bottom;
+        int cr;
+        switch (op) {
+                case MDT_TXN_CAPA_KEYS_WRITE_OP:
+                case MDT_TXN_LAST_RCVD_WRITE_OP:
+                        cr = dev->dd_ops->dt_credit_get(env,
+                                                        dev,
+                                                        DTO_WRITE_BLOCK);
+                break;
+                default:
+                        LBUG();
+        }
+        return cr;
 }
 
-int mdt_record_write(const struct lu_env *env,
-                     struct dt_object *dt, const struct lu_buf *buf,
-                     loff_t *pos, struct thandle *th)
+void mdt_trans_credit_init(const struct lu_env *env,
+                           struct mdt_device *mdt,
+                           enum mdt_txn_op op)
 {
-        int rc;
+        struct mdt_thread_info *mti;
+        struct txn_param *p;
+        int cr;
 
-        LASSERTF(dt != NULL, "dt is NULL when we want to write record\n");
-        LASSERT(th != NULL);
-        rc = dt->do_body_ops->dbo_write(env, dt, buf, pos, th, BYPASS_CAPA);
-        if (rc == buf->lb_len)
-                rc = 0;
-        else if (rc >= 0)
-                rc = -EFAULT;
-        return rc;
-}
-/* only one record write */
+        mti = lu_context_key_get(&env->le_ctx, &mdt_thread_key);
+        p = &mti->mti_txn_param;
 
-enum {
-        MDT_TXN_LAST_RCVD_WRITE_CREDITS = 3
-};
+        cr = mdt_trans_credit_get(env, mdt, op);
+        txn_param_init(p, cr);
+}
 
 struct thandle* mdt_trans_start(const struct lu_env *env,
-                                struct mdt_device *mdt, int credits)
+                                struct mdt_device *mdt)
 {
         struct mdt_thread_info *mti;
         struct txn_param *p;
 
         mti = lu_context_key_get(&env->le_ctx, &mdt_thread_key);
         p = &mti->mti_txn_param;
-        txn_param_init(p, credits);
 
         /* export can require sync operations */
         if (mti->mti_exp != NULL)
@@ -122,61 +134,6 @@ void mdt_trans_stop(const struct lu_env *env,
         mdt->mdt_bottom->dd_ops->dt_trans_stop(env, th);
 }
 
-/* last_rcvd handling */
-static inline void msd_le_to_cpu(struct mdt_server_data *buf,
-                                 struct mdt_server_data *msd)
-{
-        memcpy(msd->msd_uuid, buf->msd_uuid, sizeof (msd->msd_uuid));
-        msd->msd_last_transno     = le64_to_cpu(buf->msd_last_transno);
-        msd->msd_mount_count      = le64_to_cpu(buf->msd_mount_count);
-        msd->msd_feature_compat   = le32_to_cpu(buf->msd_feature_compat);
-        msd->msd_feature_rocompat = le32_to_cpu(buf->msd_feature_rocompat);
-        msd->msd_feature_incompat = le32_to_cpu(buf->msd_feature_incompat);
-        msd->msd_server_size      = le32_to_cpu(buf->msd_server_size);
-        msd->msd_client_start     = le32_to_cpu(buf->msd_client_start);
-        msd->msd_client_size      = le16_to_cpu(buf->msd_client_size);
-}
-
-static inline void msd_cpu_to_le(struct mdt_server_data *msd,
-                                 struct mdt_server_data *buf)
-{
-        memcpy(buf->msd_uuid, msd->msd_uuid, sizeof (msd->msd_uuid));
-        buf->msd_last_transno     = cpu_to_le64(msd->msd_last_transno);
-        buf->msd_mount_count      = cpu_to_le64(msd->msd_mount_count);
-        buf->msd_feature_compat   = cpu_to_le32(msd->msd_feature_compat);
-        buf->msd_feature_rocompat = cpu_to_le32(msd->msd_feature_rocompat);
-        buf->msd_feature_incompat = cpu_to_le32(msd->msd_feature_incompat);
-        buf->msd_server_size      = cpu_to_le32(msd->msd_server_size);
-        buf->msd_client_start     = cpu_to_le32(msd->msd_client_start);
-        buf->msd_client_size      = cpu_to_le16(msd->msd_client_size);
-}
-
-static inline void mcd_le_to_cpu(struct mdt_client_data *buf,
-                                 struct mdt_client_data *mcd)
-{
-        memcpy(mcd->mcd_uuid, buf->mcd_uuid, sizeof (mcd->mcd_uuid));
-        mcd->mcd_last_transno       = le64_to_cpu(buf->mcd_last_transno);
-        mcd->mcd_last_xid           = le64_to_cpu(buf->mcd_last_xid);
-        mcd->mcd_last_result        = le32_to_cpu(buf->mcd_last_result);
-        mcd->mcd_last_data          = le32_to_cpu(buf->mcd_last_data);
-        mcd->mcd_last_close_transno = le64_to_cpu(buf->mcd_last_close_transno);
-        mcd->mcd_last_close_xid     = le64_to_cpu(buf->mcd_last_close_xid);
-        mcd->mcd_last_close_result  = le32_to_cpu(buf->mcd_last_close_result);
-}
-
-static inline void mcd_cpu_to_le(struct mdt_client_data *mcd,
-                                 struct mdt_client_data *buf)
-{
-        memcpy(buf->mcd_uuid, mcd->mcd_uuid, sizeof (mcd->mcd_uuid));
-        buf->mcd_last_transno       = cpu_to_le64(mcd->mcd_last_transno);
-        buf->mcd_last_xid           = cpu_to_le64(mcd->mcd_last_xid);
-        buf->mcd_last_result        = cpu_to_le32(mcd->mcd_last_result);
-        buf->mcd_last_data          = cpu_to_le32(mcd->mcd_last_data);
-        buf->mcd_last_close_transno = cpu_to_le64(mcd->mcd_last_close_transno);
-        buf->mcd_last_close_xid     = cpu_to_le64(mcd->mcd_last_close_xid);
-        buf->mcd_last_close_result  = cpu_to_le32(mcd->mcd_last_close_result);
-}
-
 static inline int mdt_last_rcvd_header_read(const struct lu_env *env,
                                             struct mdt_device *mdt)
 {
@@ -186,22 +143,23 @@ static inline int mdt_last_rcvd_header_read(const struct lu_env *env,
         mti = lu_context_key_get(&env->le_ctx, &mdt_thread_key);
 
         mti->mti_off = 0;
-        rc = mdt_record_read(env, mdt->mdt_last_rcvd,
-                             mdt_buf(env, &mti->mti_msd, sizeof(mti->mti_msd)),
-                             &mti->mti_off);
+        rc = dt_record_read(env, mdt->mdt_last_rcvd,
+                            mdt_buf(env, &mti->mti_lsd, sizeof(mti->mti_lsd)),
+                            &mti->mti_off);
         if (rc == 0)
-                msd_le_to_cpu(&mti->mti_msd, &mdt->mdt_msd);
+                lsd_le_to_cpu(&mti->mti_lsd, &mdt->mdt_lsd);
 
         CDEBUG(D_INFO, "read last_rcvd header rc = %d:\n"
                        "uuid = %s\n"
                        "last_transno = "LPU64"\n",
-                        rc, mdt->mdt_msd.msd_uuid,
-                        mdt->mdt_msd.msd_last_transno);
+                        rc, mdt->mdt_lsd.lsd_uuid,
+                        mdt->mdt_lsd.lsd_last_transno);
         return rc;
 }
 
 static inline int mdt_last_rcvd_header_write(const struct lu_env *env,
-                                             struct mdt_device *mdt)
+                                             struct mdt_device *mdt,
+                                             int need_sync)
 {
         struct mdt_thread_info *mti;
         struct thandle *th;
@@ -210,111 +168,120 @@ static inline int mdt_last_rcvd_header_write(const struct lu_env *env,
 
         mti = lu_context_key_get(&env->le_ctx, &mdt_thread_key);
 
-        th = mdt_trans_start(env, mdt, MDT_TXN_LAST_RCVD_WRITE_CREDITS);
+        if (mti->mti_exp) {
+                spin_lock(&mti->mti_exp->exp_lock);
+                mti->mti_exp->exp_need_sync = need_sync;
+                spin_unlock(&mti->mti_exp->exp_lock);
+        }
+        mdt_trans_credit_init(env, mdt, MDT_TXN_LAST_RCVD_WRITE_OP);
+        th = mdt_trans_start(env, mdt);
         if (IS_ERR(th))
                 RETURN(PTR_ERR(th));
 
-        mti->mti_off = 0;        
-        msd_cpu_to_le(&mdt->mdt_msd, &mti->mti_msd);
+        mti->mti_off = 0;
+        lsd_cpu_to_le(&mdt->mdt_lsd, &mti->mti_lsd);
+
+        if (need_sync && mti->mti_exp)
+                mdt_trans_add_cb(th, lut_cb_client, mti->mti_exp);
 
-        rc = mdt_record_write(env, mdt->mdt_last_rcvd,
-                              mdt_buf_const(env, &mti->mti_msd, sizeof(mti->mti_msd)),
-                              &mti->mti_off, th);
+        rc = dt_record_write(env, mdt->mdt_last_rcvd,
+                             mdt_buf_const(env, &mti->mti_lsd,
+                                           sizeof(mti->mti_lsd)),
+                             &mti->mti_off, th);
 
         mdt_trans_stop(env, mdt, th);
 
         CDEBUG(D_INFO, "write last_rcvd header rc = %d:\n"
                "uuid = %s\nlast_transno = "LPU64"\n",
-               rc, mdt->mdt_msd.msd_uuid, mdt->mdt_msd.msd_last_transno);
-        
+               rc, mdt->mdt_lsd.lsd_uuid, mdt->mdt_lsd.lsd_last_transno);
+
         RETURN(rc);
 }
 
 static int mdt_last_rcvd_read(const struct lu_env *env,
                               struct mdt_device *mdt,
-                              struct mdt_client_data *mcd, loff_t *off)
+                              struct lsd_client_data *lcd, loff_t *off)
 {
         struct mdt_thread_info *mti;
-        struct mdt_client_data *tmp;
+        struct lsd_client_data *tmp;
         int rc;
 
         mti = lu_context_key_get(&env->le_ctx, &mdt_thread_key);
-        tmp = &mti->mti_mcd;
-        rc = mdt_record_read(env, mdt->mdt_last_rcvd,
-                             mdt_buf(env, tmp, sizeof(*tmp)), off);
+        tmp = &mti->mti_lcd;
+        rc = dt_record_read(env, mdt->mdt_last_rcvd,
+                            mdt_buf(env, tmp, sizeof(*tmp)), off);
         if (rc == 0)
-                mcd_le_to_cpu(tmp, mcd);
+                lcd_le_to_cpu(tmp, lcd);
 
-        CDEBUG(D_INFO, "read mcd @%d rc = %d:\n"
+        CDEBUG(D_INFO, "read lcd @%d rc = %d:\n"
                        "uuid = %s\n"
                        "last_transno = "LPU64"\n"
                        "last_xid = "LPU64"\n"
-                       "last_result = %d\n"
-                       "last_data = %d\n"
+                       "last_result = %u\n"
+                       "last_data = %u\n"
                        "last_close_transno = "LPU64"\n"
                        "last_close_xid = "LPU64"\n"
-                       "last_close_result = %d\n",
-                        (int)*off - sizeof(*tmp),
+                       "last_close_result = %u\n",
+                        (int)(*off - sizeof(*tmp)),
                         rc,
-                        mcd->mcd_uuid,
-                        mcd->mcd_last_transno,
-                        mcd->mcd_last_xid,
-                        mcd->mcd_last_result,
-                        mcd->mcd_last_data,
-                        mcd->mcd_last_close_transno,
-                        mcd->mcd_last_close_xid,
-                        mcd->mcd_last_close_result);
+                        lcd->lcd_uuid,
+                        lcd->lcd_last_transno,
+                        lcd->lcd_last_xid,
+                        lcd->lcd_last_result,
+                        lcd->lcd_last_data,
+                        lcd->lcd_last_close_transno,
+                        lcd->lcd_last_close_xid,
+                        lcd->lcd_last_close_result);
         return rc;
 }
 
 static int mdt_last_rcvd_write(const struct lu_env *env,
                                struct mdt_device *mdt,
-                               struct mdt_client_data *mcd,
+                               struct lsd_client_data *lcd,
                                loff_t *off, struct thandle *th)
 {
         struct mdt_thread_info *mti;
-        struct mdt_client_data *tmp;
+        struct lsd_client_data *tmp;
         int rc;
 
         LASSERT(th != NULL);
         mti = lu_context_key_get(&env->le_ctx, &mdt_thread_key);
-        tmp = &mti->mti_mcd;
+        tmp = &mti->mti_lcd;
 
-        mcd_cpu_to_le(mcd, tmp);
+        lcd_cpu_to_le(lcd, tmp);
 
-        rc = mdt_record_write(env, mdt->mdt_last_rcvd,
-                              mdt_buf_const(env, tmp, sizeof(*tmp)), off, th);
+        rc = dt_record_write(env, mdt->mdt_last_rcvd,
+                             mdt_buf_const(env, tmp, sizeof(*tmp)), off, th);
 
-        CDEBUG(D_INFO, "write mcd @%d rc = %d:\n"
+        CDEBUG(D_INFO, "write lcd @%d rc = %d:\n"
                        "uuid = %s\n"
                        "last_transno = "LPU64"\n"
                        "last_xid = "LPU64"\n"
-                       "last_result = %d\n"
-                       "last_data = %d\n"
+                       "last_result = %u\n"
+                       "last_data = %u\n"
                        "last_close_transno = "LPU64"\n"
                        "last_close_xid = "LPU64"\n"
-                       "last_close_result = %d\n",
-                        (int)*off - sizeof(*tmp),
+                       "last_close_result = %u\n",
+                        (int)(*off - sizeof(*tmp)),
                         rc,
-                        mcd->mcd_uuid,
-                        mcd->mcd_last_transno,
-                        mcd->mcd_last_xid,
-                        mcd->mcd_last_result,
-                        mcd->mcd_last_data,
-                        mcd->mcd_last_close_transno,
-                        mcd->mcd_last_close_xid,
-                        mcd->mcd_last_close_result);
+                        lcd->lcd_uuid,
+                        lcd->lcd_last_transno,
+                        lcd->lcd_last_xid,
+                        lcd->lcd_last_result,
+                        lcd->lcd_last_data,
+                        lcd->lcd_last_close_transno,
+                        lcd->lcd_last_close_xid,
+                        lcd->lcd_last_close_result);
         return rc;
 }
 
-
 static int mdt_clients_data_init(const struct lu_env *env,
                                  struct mdt_device *mdt,
                                  unsigned long last_size)
 {
-        struct mdt_server_data *msd = &mdt->mdt_msd;
-        struct mdt_client_data *mcd = NULL;
-        struct obd_device      *obd = mdt->mdt_md_dev.md_lu_dev.ld_obd;
+        struct lr_server_data  *lsd = &mdt->mdt_lsd;
+        struct lsd_client_data *lcd = NULL;
+        struct obd_device      *obd = mdt2obd_dev(mdt);
         loff_t off;
         int cl_idx;
         int rc = 0;
@@ -324,21 +291,21 @@ static int mdt_clients_data_init(const struct lu_env *env,
          * the header.  If we find clients with higher last_transno values
          * then those clients may need recovery done. */
         LASSERT(atomic_read(&obd->obd_req_replay_clients) == 0);
-        for (cl_idx = 0, off = msd->msd_client_start;
+        for (cl_idx = 0, off = lsd->lsd_client_start;
              off < last_size; cl_idx++) {
                 __u64 last_transno;
                 struct obd_export *exp;
 
-                if (!mcd) {
-                        OBD_ALLOC_PTR(mcd);
-                        if (!mcd)
+                if (!lcd) {
+                        OBD_ALLOC_PTR(lcd);
+                        if (!lcd)
                                 RETURN(-ENOMEM);
                 }
 
-                off = msd->msd_client_start +
-                        cl_idx * msd->msd_client_size;
+                off = lsd->lsd_client_start +
+                        cl_idx * lsd->lsd_client_size;
 
-                rc = mdt_last_rcvd_read(env, mdt, mcd, &off);
+                rc = mdt_last_rcvd_read(env, mdt, lcd, &off);
                 if (rc) {
                         CERROR("error reading MDS %s idx %d, off %llu: rc %d\n",
                                LAST_RCVD, cl_idx, off, rc);
@@ -346,40 +313,42 @@ static int mdt_clients_data_init(const struct lu_env *env,
                         break; /* read error shouldn't cause startup to fail */
                 }
 
-                if (mcd->mcd_uuid[0] == '\0') {
+                if (lcd->lcd_uuid[0] == '\0') {
                         CDEBUG(D_INFO, "skipping zeroed client at offset %d\n",
                                cl_idx);
                         continue;
                 }
 
-                last_transno = mcd_last_transno(mcd);
+                last_transno = lcd_last_transno(lcd);
 
                 /* These exports are cleaned up by mdt_obd_disconnect(), so
                  * they need to be set up like real exports as
                  * mdt_obd_connect() does.
                  */
                 CDEBUG(D_HA, "RCVRNG CLIENT uuid: %s idx: %d lr: "LPU64
-                       " srv lr: "LPU64" lx: "LPU64"\n", mcd->mcd_uuid, cl_idx,
-                       last_transno, msd->msd_last_transno,
-                       mcd_last_xid(mcd));
+                       " srv lr: "LPU64" lx: "LPU64"\n", lcd->lcd_uuid, cl_idx,
+                       last_transno, lsd->lsd_last_transno,
+                       lcd_last_xid(lcd));
 
-                exp = class_new_export(obd, (struct obd_uuid *)mcd->mcd_uuid);
+                exp = class_new_export(obd, (struct obd_uuid *)lcd->lcd_uuid);
                 if (IS_ERR(exp)) {
                         if (PTR_ERR(exp) == -EALREADY) {
                                 /* export already exists, zero out this one */
-                                mcd->mcd_uuid[0] = '\0'; 
+                                lcd->lcd_uuid[0] = '\0';
                         } else
                                 GOTO(err_client, rc = PTR_ERR(exp));
                 } else {
-                        struct mdt_thread_info *mti;                        
+                        struct mdt_thread_info *mti;
                         mti = lu_context_key_get(&env->le_ctx, &mdt_thread_key);
                         LASSERT(mti != NULL);
                         mti->mti_exp = exp;
-                        exp->exp_mdt_data.med_mcd = mcd;
+                        exp->exp_mdt_data.med_lcd = lcd;
                         rc = mdt_client_add(env, mdt, cl_idx);
                         /* can't fail existing */
-                        LASSERTF(rc == 0, "rc = %d\n", rc); 
-                        mcd = NULL;
+                        LASSERTF(rc == 0, "rc = %d\n", rc);
+                        /* VBR: set export last committed version */
+                        exp->exp_last_committed = last_transno;
+                        lcd = NULL;
                         spin_lock(&exp->exp_lock);
                         exp->exp_connecting = 0;
                         exp->exp_in_recovery = 0;
@@ -398,30 +367,32 @@ static int mdt_clients_data_init(const struct lu_env *env,
         }
 
 err_client:
-        if (mcd)
-                OBD_FREE_PTR(mcd);
+        if (lcd)
+                OBD_FREE_PTR(lcd);
         RETURN(rc);
 }
 
 static int mdt_server_data_init(const struct lu_env *env,
-                                struct mdt_device *mdt)
+                                struct mdt_device *mdt,
+                                struct lustre_sb_info *lsi)
 {
-        struct mdt_server_data *msd = &mdt->mdt_msd;
-        struct mdt_client_data *mcd = NULL;
-        struct obd_device      *obd = mdt->mdt_md_dev.md_lu_dev.ld_obd;
+        struct lr_server_data  *lsd = &mdt->mdt_lsd;
+        struct lsd_client_data *lcd = NULL;
+        struct obd_device      *obd = mdt2obd_dev(mdt);
         struct mdt_thread_info *mti;
         struct dt_object       *obj;
         struct lu_attr         *la;
+        struct lustre_disk_data  *ldd;
         unsigned long last_rcvd_size;
         __u64 mount_count;
         int rc;
         ENTRY;
 
         /* ensure padding in the struct is the correct size */
-        CLASSERT(offsetof(struct mdt_server_data, msd_padding) +
-                sizeof(msd->msd_padding) == LR_SERVER_SIZE);
-        CLASSERT(offsetof(struct mdt_client_data, mcd_padding) +
-                sizeof(mcd->mcd_padding) == LR_CLIENT_SIZE);
+        CLASSERT(offsetof(struct lr_server_data, lsd_padding) +
+                sizeof(lsd->lsd_padding) == LR_SERVER_SIZE);
+        CLASSERT(offsetof(struct lsd_client_data, lcd_padding) +
+                sizeof(lcd->lcd_padding) == LR_CLIENT_SIZE);
 
         mti = lu_context_key_get(&env->le_ctx, &mdt_thread_key);
         LASSERT(mti != NULL);
@@ -437,15 +408,15 @@ static int mdt_server_data_init(const struct lu_env *env,
         if (last_rcvd_size == 0) {
                 LCONSOLE_WARN("%s: new disk, initializing\n", obd->obd_name);
 
-                memcpy(msd->msd_uuid, obd->obd_uuid.uuid,
-                       sizeof(msd->msd_uuid));
-                msd->msd_last_transno = 0;
-                msd->msd_mount_count = 0;
-                msd->msd_server_size = LR_SERVER_SIZE;
-                msd->msd_client_start = LR_CLIENT_START;
-                msd->msd_client_size = LR_CLIENT_SIZE;
-                msd->msd_feature_rocompat = OBD_ROCOMPAT_LOVOBJID;
-                msd->msd_feature_incompat = OBD_INCOMPAT_MDT |
+                memcpy(lsd->lsd_uuid, obd->obd_uuid.uuid,
+                       sizeof(lsd->lsd_uuid));
+                lsd->lsd_last_transno = 0;
+                lsd->lsd_mount_count = 0;
+                lsd->lsd_server_size = LR_SERVER_SIZE;
+                lsd->lsd_client_start = LR_CLIENT_START;
+                lsd->lsd_client_size = LR_CLIENT_SIZE;
+                lsd->lsd_feature_rocompat = OBD_ROCOMPAT_LOVOBJID;
+                lsd->lsd_feature_incompat = OBD_INCOMPAT_MDT |
                                                        OBD_INCOMPAT_COMMON_LR;
         } else {
                 LCONSOLE_WARN("%s: used disk, loading\n", obd->obd_name);
@@ -454,20 +425,37 @@ static int mdt_server_data_init(const struct lu_env *env,
                         CERROR("error reading MDS %s: rc %d\n", LAST_RCVD, rc);
                         GOTO(out, rc);
                 }
-                if (strcmp(msd->msd_uuid, obd->obd_uuid.uuid) != 0) {
+                if (strcmp(lsd->lsd_uuid, obd->obd_uuid.uuid) != 0) {
                         LCONSOLE_ERROR_MSG(0x157, "Trying to start OBD %s using"
                                            "the wrong disk %s. Were the /dev/ "
                                            "assignments rearranged?\n",
-                                           obd->obd_uuid.uuid, msd->msd_uuid);
+                                           obd->obd_uuid.uuid, lsd->lsd_uuid);
                         GOTO(out, rc = -EINVAL);
                 }
+
+                /** evict all clients as it is first boot with old last_rcvd */
+                if (!(lsd->lsd_feature_incompat & OBD_INCOMPAT_20)) {
+                        LCONSOLE_WARN("Mounting %s at first time on old FS, "
+                                      "remove all clients for interop needs\n",
+                                      obd->obd_name);
+                        simple_truncate(lsi->lsi_srv_mnt->mnt_sb->s_root,
+                                        lsi->lsi_srv_mnt, LAST_RCVD,
+                                        lsd->lsd_client_start);
+                        last_rcvd_size = lsd->lsd_client_start;
+                }
         }
-        mount_count = msd->msd_mount_count;
+        mount_count = lsd->lsd_mount_count;
+
+        ldd = lsi->lsi_ldd;
 
-        msd->msd_feature_compat = OBD_COMPAT_MDT;
+        if (ldd->ldd_flags & LDD_F_IAM_DIR)
+                lsd->lsd_feature_incompat |= OBD_INCOMPAT_IAM_DIR;
+
+        lsd->lsd_feature_compat = 0;
+        lsd->lsd_feature_incompat |= OBD_INCOMPAT_FID | OBD_INCOMPAT_20;
 
         spin_lock(&mdt->mdt_transno_lock);
-        mdt->mdt_last_transno = msd->msd_last_transno;
+        mdt->mdt_last_transno = lsd->lsd_last_transno;
         spin_unlock(&mdt->mdt_transno_lock);
 
         CDEBUG(D_INODE, "========BEGIN DUMPING LAST_RCVD========\n");
@@ -476,21 +464,21 @@ static int mdt_server_data_init(const struct lu_env *env,
         CDEBUG(D_INODE, "%s: server mount_count: "LPU64"\n",
                obd->obd_name, mount_count + 1);
         CDEBUG(D_INODE, "%s: server data size: %u\n",
-               obd->obd_name, msd->msd_server_size);
+               obd->obd_name, lsd->lsd_server_size);
         CDEBUG(D_INODE, "%s: per-client data start: %u\n",
-               obd->obd_name, msd->msd_client_start);
+               obd->obd_name, lsd->lsd_client_start);
         CDEBUG(D_INODE, "%s: per-client data size: %u\n",
-               obd->obd_name, msd->msd_client_size);
+               obd->obd_name, lsd->lsd_client_size);
         CDEBUG(D_INODE, "%s: last_rcvd size: %lu\n",
                obd->obd_name, last_rcvd_size);
         CDEBUG(D_INODE, "%s: last_rcvd clients: %lu\n", obd->obd_name,
-               last_rcvd_size <= msd->msd_client_start ? 0 :
-               (last_rcvd_size - msd->msd_client_start) /
-                msd->msd_client_size);
+               last_rcvd_size <= lsd->lsd_client_start ? 0 :
+               (last_rcvd_size - lsd->lsd_client_start) /
+                lsd->lsd_client_size);
         CDEBUG(D_INODE, "========END DUMPING LAST_RCVD========\n");
 
-        if (!msd->msd_server_size || !msd->msd_client_start ||
-            !msd->msd_client_size) {
+        if (!lsd->lsd_server_size || !lsd->lsd_client_start ||
+            !lsd->lsd_client_size) {
                 CERROR("Bad last_rcvd contents!\n");
                 GOTO(out, rc = -EINVAL);
         }
@@ -505,24 +493,26 @@ static int mdt_server_data_init(const struct lu_env *env,
         obd->obd_last_committed = mdt->mdt_last_transno;
         spin_unlock(&mdt->mdt_transno_lock);
 
-        mdt->mdt_mount_count++;
-        msd->msd_mount_count = mdt->mdt_mount_count;
+        mdt->mdt_mount_count = mount_count + 1;
+        lsd->lsd_mount_count = mdt->mdt_mount_count;
 
         /* save it, so mount count and last_transno is current */
-        rc = mdt_server_data_update(env, mdt);
+        rc = mdt_server_data_update(env, mdt, (mti->mti_exp &&
+                                               mti->mti_exp->exp_need_sync));
         if (rc)
                 GOTO(err_client, rc);
 
         RETURN(0);
 
 err_client:
-        target_recovery_fini(obd);
+        class_disconnect_exports(obd);
 out:
         return rc;
 }
 
 static int mdt_server_data_update(const struct lu_env *env,
-                                  struct mdt_device *mdt)
+                                  struct mdt_device *mdt,
+                                  int need_sync)
 {
         int rc = 0;
         ENTRY;
@@ -531,7 +521,7 @@ static int mdt_server_data_update(const struct lu_env *env,
                mdt->mdt_mount_count, mdt->mdt_last_transno);
 
         spin_lock(&mdt->mdt_transno_lock);
-        mdt->mdt_msd.msd_last_transno = mdt->mdt_last_transno;
+        mdt->mdt_lsd.lsd_last_transno = mdt->mdt_last_transno;
         spin_unlock(&mdt->mdt_transno_lock);
 
         /*
@@ -539,26 +529,18 @@ static int mdt_server_data_update(const struct lu_env *env,
          * mdt->mdt_last_rcvd may be NULL that time.
          */
         if (mdt->mdt_last_rcvd != NULL)
-                rc = mdt_last_rcvd_header_write(env, mdt);
+                rc = mdt_last_rcvd_header_write(env, mdt, need_sync);
         RETURN(rc);
 }
 
-void mdt_cb_new_client(const struct mdt_device *mdt, __u64 transno,
-                                  void *data, int err) 
-{
-        struct obd_device *obd = mdt->mdt_md_dev.md_lu_dev.ld_obd;
-        
-        target_client_add_cb(obd, transno, data, err);
-}
-
 int mdt_client_new(const struct lu_env *env, struct mdt_device *mdt)
 {
         unsigned long *bitmap = mdt->mdt_client_bitmap;
         struct mdt_thread_info *mti;
         struct mdt_export_data *med;
-        struct mdt_client_data *mcd;
-        struct mdt_server_data *msd = &mdt->mdt_msd;
-        struct obd_device *obd = mdt->mdt_md_dev.md_lu_dev.ld_obd;
+        struct lsd_client_data *lcd;
+        struct lr_server_data  *lsd = &mdt->mdt_lsd;
+        struct obd_device *obd = mdt2obd_dev(mdt);
         struct thandle *th;
         loff_t off;
         int rc;
@@ -569,10 +551,10 @@ int mdt_client_new(const struct lu_env *env, struct mdt_device *mdt)
         LASSERT(mti != NULL);
 
         med = &mti->mti_exp->exp_mdt_data;
-        mcd = med->med_mcd;
+        lcd = med->med_lcd;
 
         LASSERT(bitmap != NULL);
-        if (!strcmp(med->med_mcd->mcd_uuid, obd->obd_uuid.uuid))
+        if (!strcmp(med->med_lcd->lcd_uuid, obd->obd_uuid.uuid))
                 RETURN(0);
 
         /* the bitmap operations can handle cl_idx > sizeof(long) * 8, so
@@ -591,30 +573,37 @@ int mdt_client_new(const struct lu_env *env, struct mdt_device *mdt)
         spin_unlock(&mdt->mdt_client_bitmap_lock);
 
         CDEBUG(D_INFO, "client at idx %d with UUID '%s' added\n",
-               cl_idx, med->med_mcd->mcd_uuid);
+               cl_idx, med->med_lcd->lcd_uuid);
 
         med->med_lr_idx = cl_idx;
-        med->med_lr_off = msd->msd_client_start +
-                          (cl_idx * msd->msd_client_size);
-        init_mutex(&med->med_mcd_lock);
+        med->med_lr_off = lsd->lsd_client_start +
+                          (cl_idx * lsd->lsd_client_size);
+        init_mutex(&med->med_lcd_lock);
 
         LASSERTF(med->med_lr_off > 0, "med_lr_off = %llu\n", med->med_lr_off);
-        /* write new client data */
+
+        /* Write new client data. */
         off = med->med_lr_off;
-        th = mdt_trans_start(env, mdt, MDT_TXN_LAST_RCVD_WRITE_CREDITS);
+        mdt_trans_credit_init(env, mdt, MDT_TXN_LAST_RCVD_WRITE_OP);
+
+        th = mdt_trans_start(env, mdt);
         if (IS_ERR(th))
                 RETURN(PTR_ERR(th));
 
-        /* until this operations will be committed the sync is needed for this
-         * export */
-        mdt_trans_add_cb(th, mdt_cb_new_client, mti->mti_exp);
+        /*
+         * Until this operations will be committed the sync is needed
+         * for this export. This should be done _after_ starting the
+         * transaction so that many connecting clients will not bring
+         * server down with lots of sync writes.
+         */
+        mdt_trans_add_cb(th, lut_cb_client, mti->mti_exp);
         spin_lock(&mti->mti_exp->exp_lock);
         mti->mti_exp->exp_need_sync = 1;
         spin_unlock(&mti->mti_exp->exp_lock);
 
-        rc = mdt_last_rcvd_write(env, mdt, mcd, &off, th);
-        CDEBUG(D_INFO, "wrote client mcd at idx %u off %llu (len %u)\n",
-               cl_idx, med->med_lr_off, sizeof(*mcd));
+        rc = mdt_last_rcvd_write(env, mdt, lcd, &off, th);
+        CDEBUG(D_INFO, "wrote client lcd at idx %u off %llu (len "LPSZ")\n",
+               cl_idx, med->med_lr_off, sizeof(*lcd));
         mdt_trans_stop(env, mdt, th);
 
         RETURN(rc);
@@ -634,8 +623,8 @@ int mdt_client_add(const struct lu_env *env,
         struct mdt_thread_info *mti;
         struct mdt_export_data *med;
         unsigned long *bitmap = mdt->mdt_client_bitmap;
-        struct obd_device *obd = mdt->mdt_md_dev.md_lu_dev.ld_obd;
-        struct mdt_server_data *msd = &mdt->mdt_msd;
+        struct obd_device *obd = mdt2obd_dev(mdt);
+        struct lr_server_data *lsd = &mdt->mdt_lsd;
         int rc = 0;
         ENTRY;
 
@@ -647,7 +636,7 @@ int mdt_client_add(const struct lu_env *env,
         LASSERT(bitmap != NULL);
         LASSERTF(cl_idx >= 0, "%d\n", cl_idx);
 
-        if (!strcmp(med->med_mcd->mcd_uuid, obd->obd_uuid.uuid))
+        if (!strcmp(med->med_lcd->lcd_uuid, obd->obd_uuid.uuid))
                 RETURN(0);
 
         spin_lock(&mdt->mdt_client_bitmap_lock);
@@ -659,12 +648,12 @@ int mdt_client_add(const struct lu_env *env,
         spin_unlock(&mdt->mdt_client_bitmap_lock);
 
         CDEBUG(D_INFO, "client at idx %d with UUID '%s' added\n",
-               cl_idx, med->med_mcd->mcd_uuid);
+               cl_idx, med->med_lcd->lcd_uuid);
 
         med->med_lr_idx = cl_idx;
-        med->med_lr_off = msd->msd_client_start +
-                          (cl_idx * msd->msd_client_size);
-        init_mutex(&med->med_mcd_lock);
+        med->med_lr_off = lsd->lsd_client_start +
+                          (cl_idx * lsd->lsd_client_size);
+        init_mutex(&med->med_lcd_lock);
 
         LASSERTF(med->med_lr_off > 0, "med_lr_off = %llu\n", med->med_lr_off);
 
@@ -675,23 +664,26 @@ int mdt_client_del(const struct lu_env *env, struct mdt_device *mdt)
 {
         struct mdt_thread_info *mti;
         struct mdt_export_data *med;
-        struct mdt_client_data *mcd;
-        struct obd_device      *obd = mdt->mdt_md_dev.md_lu_dev.ld_obd;
-        struct thandle *th;
-        loff_t off;
-        int rc = 0;
+        struct lsd_client_data *lcd;
+        struct obd_device      *obd = mdt2obd_dev(mdt);
+        struct obd_export      *exp;
+        struct thandle         *th;
+        int                     need_sync;
+        loff_t                  off;
+        int                     rc = 0;
         ENTRY;
 
         mti = lu_context_key_get(&env->le_ctx, &mdt_thread_key);
         LASSERT(mti != NULL);
 
-        med = &mti->mti_exp->exp_mdt_data;
-        mcd = med->med_mcd;
-        if (!mcd)
+        exp = mti->mti_exp;
+        med = &exp->exp_mdt_data;
+        lcd = med->med_lcd;
+        if (!lcd)
                 RETURN(0);
 
-        /* XXX: If mcd_uuid were a real obd_uuid, I could use obd_uuid_equals */
-        if (!strcmp(med->med_mcd->mcd_uuid, obd->obd_uuid.uuid))
+        /* XXX: If lcd_uuid were a real obd_uuid, I could use obd_uuid_equals */
+        if (!strcmp(lcd->lcd_uuid, obd->obd_uuid.uuid))
                 GOTO(free, 0);
 
         CDEBUG(D_INFO, "freeing client at idx %u, offset %lld\n",
@@ -719,40 +711,61 @@ int mdt_client_del(const struct lu_env *env, struct mdt_device *mdt)
                 LBUG();
         }
 
+        /* Don't force sync on disconnect if aborting recovery,
+         * or it does num_clients * num_osts.  b=17194 */
+        need_sync = (!exp->exp_libclient || exp->exp_need_sync) &&
+                     !(exp->exp_flags & OBD_OPT_ABORT_RECOV);
+
         /*
          * This may be called from difficult reply handler path and
          * mdt->mdt_last_rcvd may be NULL that time.
          */
         if (mdt->mdt_last_rcvd != NULL) {
-                th = mdt_trans_start(env, mdt, MDT_TXN_LAST_RCVD_WRITE_CREDITS);
+                mdt_trans_credit_init(env, mdt, MDT_TXN_LAST_RCVD_WRITE_OP);
+
+                spin_lock(&exp->exp_lock);
+                exp->exp_need_sync = need_sync;
+                spin_unlock(&exp->exp_lock);
+
+                th = mdt_trans_start(env, mdt);
                 if (IS_ERR(th))
                         GOTO(free, rc = PTR_ERR(th));
 
-                mutex_down(&med->med_mcd_lock);
-                memset(mcd, 0, sizeof *mcd);
+                if (need_sync) {
+                        /*
+                         * Until this operations will be committed the sync
+                         * is needed for this export.
+                         */
+                        mdt_trans_add_cb(th, lut_cb_client, exp);
+                }
+
+                mutex_down(&med->med_lcd_lock);
+                memset(lcd, 0, sizeof *lcd);
 
-                rc = mdt_last_rcvd_write(env, mdt, mcd, &off, th);
-                mutex_up(&med->med_mcd_lock);
+                rc = mdt_last_rcvd_write(env, mdt, lcd, &off, th);
+                mutex_up(&med->med_lcd_lock);
                 mdt_trans_stop(env, mdt, th);
         }
 
         CDEBUG(rc == 0 ? D_INFO : D_ERROR, "Zeroing out client idx %u in "
-               "%s rc %d\n",  med->med_lr_idx, LAST_RCVD, rc);
+               "%s %ssync rc %d\n",  med->med_lr_idx, LAST_RCVD, 
+               need_sync ? "" : "a", rc);
 
         spin_lock(&mdt->mdt_client_bitmap_lock);
         clear_bit(med->med_lr_idx, mdt->mdt_client_bitmap);
         spin_unlock(&mdt->mdt_client_bitmap_lock);
-        
+
         /*
-         * Make sure the server's last_transno is up to date. Do this after the
-         * client is freed so we know all the client's transactions have been
-         * committed.
+         * Make sure the server's last_transno is up to date. Do this
+         * after the client is freed so we know all the client's
+         * transactions have been committed.
          */
-        mdt_server_data_update(env, mdt);
+        mdt_server_data_update(env, mdt, need_sync);
+
         EXIT;
 free:
-        OBD_FREE_PTR(mcd);
-        med->med_mcd = NULL;
+        OBD_FREE_PTR(lcd);
+        med->med_lcd = NULL;
         return 0;
 }
 
@@ -765,11 +778,10 @@ static int mdt_last_rcvd_update(struct mdt_thread_info *mti,
         struct mdt_device *mdt = mti->mti_mdt;
         struct ptlrpc_request *req = mdt_info_req(mti);
         struct mdt_export_data *med;
-        struct mdt_client_data *mcd;
+        struct lsd_client_data *lcd;
         loff_t off;
         int err;
         __s32 rc = th->th_result;
-        __u64 *transno_p;
 
         ENTRY;
         LASSERT(req);
@@ -777,7 +789,7 @@ static int mdt_last_rcvd_update(struct mdt_thread_info *mti,
         LASSERT(mdt);
         med = &req->rq_export->exp_mdt_data;
         LASSERT(med);
-        mcd = med->med_mcd;
+        lcd = med->med_lcd;
         /* if the export has already been failed, we have no last_rcvd slot */
         if (req->rq_export->exp_failed) {
                 CWARN("commit transaction for disconnected client %s: rc %d\n",
@@ -788,41 +800,40 @@ static int mdt_last_rcvd_update(struct mdt_thread_info *mti,
         }
 
         off = med->med_lr_off;
-        mutex_down(&med->med_mcd_lock);
+        LASSERT(ergo(mti->mti_transno == 0, rc != 0));
+        mutex_down(&med->med_lcd_lock);
         if (lustre_msg_get_opc(req->rq_reqmsg) == MDS_CLOSE ||
             lustre_msg_get_opc(req->rq_reqmsg) == MDS_DONE_WRITING) {
-                transno_p = &mcd->mcd_last_close_transno;
-                mcd->mcd_last_close_xid = req->rq_xid;
-                mcd->mcd_last_close_result = rc;
+                if (mti->mti_transno != 0)
+                        lcd->lcd_last_close_transno = mti->mti_transno;
+                lcd->lcd_last_close_xid = req->rq_xid;
+                lcd->lcd_last_close_result = rc;
         } else {
-                transno_p = &mcd->mcd_last_transno;
-                mcd->mcd_last_xid = req->rq_xid;
-                mcd->mcd_last_result = rc;
+                /* VBR: save versions in last_rcvd for reconstruct. */
+                __u64 *pre_versions = lustre_msg_get_versions(req->rq_repmsg);
+                if (pre_versions) {
+                        lcd->lcd_pre_versions[0] = pre_versions[0];
+                        lcd->lcd_pre_versions[1] = pre_versions[1];
+                        lcd->lcd_pre_versions[2] = pre_versions[2];
+                        lcd->lcd_pre_versions[3] = pre_versions[3];
+                }
+                if (mti->mti_transno != 0)
+                        lcd->lcd_last_transno = mti->mti_transno;
+                lcd->lcd_last_xid = req->rq_xid;
+                lcd->lcd_last_result = rc;
                 /*XXX: save intent_disposition in mdt_thread_info?
                  * also there is bug - intent_dispostion is __u64,
                  * see struct ldlm_reply->lock_policy_res1; */
-                 mcd->mcd_last_data = mti->mti_opdata;
+                lcd->lcd_last_data = mti->mti_opdata;
         }
 
-        /*
-         * When we store zero transno in mcd we can lost last transno value
-         * because mcd contains 0, but msd is not yet written
-         * The server data should be updated also if the latest 
-         * transno is rewritten by zero. See the bug 11125 for details.
-         */
-        if (mti->mti_transno == 0 && 
-            *transno_p == mdt->mdt_last_transno)
-                mdt_server_data_update(mti->mti_env, mdt);
-
-        *transno_p = mti->mti_transno;
-
         if (off <= 0) {
                 CERROR("client idx %d has offset %lld\n", med->med_lr_idx, off);
                 err = -EINVAL;
         } else {
-                err = mdt_last_rcvd_write(mti->mti_env, mdt, mcd, &off, th);
+                err = mdt_last_rcvd_write(mti->mti_env, mdt, lcd, &off, th);
         }
-        mutex_up(&med->med_mcd_lock);
+        mutex_up(&med->med_lcd_lock);
         RETURN(err);
 }
 
@@ -832,10 +843,24 @@ extern struct lu_context_key mdt_thread_key;
 static int mdt_txn_start_cb(const struct lu_env *env,
                             struct txn_param *param, void *cookie)
 {
-        param->tp_credits += MDT_TXN_LAST_RCVD_WRITE_CREDITS;
+        struct mdt_device *mdt = cookie;
+
+        param->tp_credits += mdt_trans_credit_get(env, mdt,
+                                                  MDT_TXN_LAST_RCVD_WRITE_OP);
         return 0;
 }
 
+/* Set new object versions */
+static void mdt_versions_set(struct mdt_thread_info *info)
+{
+        int i;
+        for (i = 0; i < PTLRPC_NUM_VERSIONS; i++)
+                if (info->mti_mos[i] != NULL)
+                        mo_version_set(info->mti_env,
+                                       mdt_object_child(info->mti_mos[i]),
+                                       info->mti_transno);
+}
+
 /* Update last_rcvd records with latests transaction data */
 static int mdt_txn_stop_cb(const struct lu_env *env,
                            struct thandle *txn, void *cookie)
@@ -859,7 +884,8 @@ static int mdt_txn_stop_cb(const struct lu_env *env,
         if (mti->mti_has_trans) {
                 /* XXX: currently there are allowed cases, but the wrong cases
                  * are also possible, so better check is needed here */
-                CDEBUG(D_INFO, "More than one transaction "LPU64"\n", mti->mti_transno);
+                CDEBUG(D_INFO, "More than one transaction "LPU64"\n",
+                       mti->mti_transno);
                 return 0;
         }
 
@@ -869,7 +895,6 @@ static int mdt_txn_stop_cb(const struct lu_env *env,
                 if (mti->mti_transno != 0) {
                         CERROR("Replay transno "LPU64" failed: rc %i\n",
                                mti->mti_transno, txn->th_result);
-                        mti->mti_transno = 0;
                 }
         } else if (mti->mti_transno == 0) {
                 mti->mti_transno = ++ mdt->mdt_last_transno;
@@ -878,10 +903,14 @@ static int mdt_txn_stop_cb(const struct lu_env *env,
                 if (mti->mti_transno > mdt->mdt_last_transno)
                         mdt->mdt_last_transno = mti->mti_transno;
         }
-
+        spin_unlock(&mdt->mdt_transno_lock);
         /* sometimes the reply message has not been successfully packed */
         LASSERT(req != NULL && req->rq_repmsg != NULL);
 
+        /** VBR: set new versions */
+        if (txn->th_result == 0)
+                mdt_versions_set(mti);
+
         /* filling reply data */
         CDEBUG(D_INODE, "transno = %llu, last_committed = %llu\n",
                mti->mti_transno, req->rq_export->exp_obd->obd_last_committed);
@@ -889,48 +918,39 @@ static int mdt_txn_stop_cb(const struct lu_env *env,
         req->rq_transno = mti->mti_transno;
         lustre_msg_set_transno(req->rq_repmsg, mti->mti_transno);
         lustre_msg_set_last_xid(req->rq_repmsg,
-                         mcd_last_xid(req->rq_export->exp_mdt_data.med_mcd));
+                         lcd_last_xid(req->rq_export->exp_mdt_data.med_lcd));
         /* save transno for the commit callback */
         txi->txi_transno = mti->mti_transno;
-        spin_unlock(&mdt->mdt_transno_lock);
+
+        /* add separate commit callback for transaction handling because we need
+         * export as parameter */
+        mdt_trans_add_cb(txn, lut_cb_last_committed,
+                         class_export_get(mti->mti_exp));
 
         return mdt_last_rcvd_update(mti, txn);
 }
 
-/* commit callback, need to update last_commited value */
+/* commit callback, need to update last_committed value */
 static int mdt_txn_commit_cb(const struct lu_env *env,
                              struct thandle *txn, void *cookie)
 {
         struct mdt_device *mdt = cookie;
-        struct obd_device *obd = md2lu_dev(&mdt->mdt_md_dev)->ld_obd;
         struct mdt_txn_info *txi;
         int i;
 
         txi = lu_context_key_get(&txn->th_ctx, &mdt_txn_key);
 
-        /* copy of obd_transno_commit_cb() but with locking */
-        spin_lock(&mdt->mdt_transno_lock);
-        if (txi->txi_transno > obd->obd_last_committed) {
-                obd->obd_last_committed = txi->txi_transno;
-                spin_unlock(&mdt->mdt_transno_lock);
-                ptlrpc_commit_replies(obd);
-        } else
-                spin_unlock(&mdt->mdt_transno_lock);
-
-        if (txi->txi_transno)
-                CDEBUG(D_HA, "%s: transno "LPD64" is committed\n",
-                       obd->obd_name, txi->txi_transno);
-
         /* iterate through all additional callbacks */
         for (i = 0; i < txi->txi_cb_count; i++) {
-                txi->txi_cb[i].mdt_cb_func(mdt, txi->txi_transno,
-                                           txi->txi_cb[i].mdt_cb_data, 0);
+                txi->txi_cb[i].lut_cb_func(&mdt->mdt_lut, txi->txi_transno,
+                                           txi->txi_cb[i].lut_cb_data, 0);
         }
         return 0;
 }
 
 int mdt_fs_setup(const struct lu_env *env, struct mdt_device *mdt,
-                 struct obd_device *obd)
+                 struct obd_device *obd,
+                 struct lustre_sb_info *lsi)
 {
         struct lu_fid fid;
         struct dt_object *o;
@@ -945,23 +965,16 @@ int mdt_fs_setup(const struct lu_env *env, struct mdt_device *mdt,
         mdt->mdt_txn_cb.dtc_txn_stop = mdt_txn_stop_cb;
         mdt->mdt_txn_cb.dtc_txn_commit = mdt_txn_commit_cb;
         mdt->mdt_txn_cb.dtc_cookie = mdt;
+        mdt->mdt_txn_cb.dtc_tag = LCT_MD_THREAD;
         CFS_INIT_LIST_HEAD(&mdt->mdt_txn_cb.dtc_linkage);
 
         dt_txn_callback_add(mdt->mdt_bottom, &mdt->mdt_txn_cb);
 
-        o = dt_store_open(env, mdt->mdt_bottom, LAST_RCVD, &fid);
-        if (!IS_ERR(o)) {
-                mdt->mdt_last_rcvd = o;
-                rc = mdt_server_data_init(env, mdt);
-                if (rc)
-                        GOTO(put_last_rcvd, rc);
-        } else {
-                rc = PTR_ERR(o);
-                CERROR("cannot open %s: rc = %d\n", LAST_RCVD, rc);
+        rc = mdt_server_data_init(env, mdt, lsi);
+        if (rc)
                 RETURN(rc);
-        }
 
-        o = dt_store_open(env, mdt->mdt_bottom, CAPA_KEYS, &fid);
+        o = dt_store_open(env, mdt->mdt_bottom, "", CAPA_KEYS, &fid);
         if (!IS_ERR(o)) {
                 mdt->mdt_ck_obj = o;
                 rc = mdt_capa_keys_init(env, mdt);
@@ -970,29 +983,24 @@ int mdt_fs_setup(const struct lu_env *env, struct mdt_device *mdt,
         } else {
                 rc = PTR_ERR(o);
                 CERROR("cannot open %s: rc = %d\n", CAPA_KEYS, rc);
-                GOTO(put_last_rcvd, rc);
+                GOTO(disconnect_exports, rc);
         }
         RETURN(0);
 
 put_ck_object:
         lu_object_put(env, &o->do_lu);
         mdt->mdt_ck_obj = NULL;
-put_last_rcvd:
-        lu_object_put(env, &mdt->mdt_last_rcvd->do_lu);
-        mdt->mdt_last_rcvd = NULL;
+disconnect_exports:
+        class_disconnect_exports(obd);
         return rc;
 }
 
-
 void mdt_fs_cleanup(const struct lu_env *env, struct mdt_device *mdt)
 {
         ENTRY;
 
         /* Remove transaction callback */
         dt_txn_callback_del(mdt->mdt_bottom, &mdt->mdt_txn_cb);
-        if (mdt->mdt_last_rcvd)
-                lu_object_put(env, &mdt->mdt_last_rcvd->do_lu);
-        mdt->mdt_last_rcvd = NULL;
         if (mdt->mdt_ck_obj)
                 lu_object_put(env, &mdt->mdt_ck_obj->do_lu);
         mdt->mdt_ck_obj = NULL;
@@ -1000,26 +1008,92 @@ void mdt_fs_cleanup(const struct lu_env *env, struct mdt_device *mdt)
 }
 
 /* reconstruction code */
-extern void mds_steal_ack_locks(struct ptlrpc_request *req);
-void mdt_req_from_mcd(struct ptlrpc_request *req,
-                      struct mdt_client_data *mcd)
+static void mdt_steal_ack_locks(struct ptlrpc_request *req)
+{
+        struct obd_export         *exp = req->rq_export;
+        struct list_head          *tmp;
+        struct ptlrpc_reply_state *oldrep;
+        struct ptlrpc_service     *svc;
+        int                        i;
+
+        /* CAVEAT EMPTOR: spinlock order */
+        spin_lock(&exp->exp_lock);
+        list_for_each (tmp, &exp->exp_outstanding_replies) {
+                oldrep = list_entry(tmp, struct ptlrpc_reply_state,rs_exp_list);
+
+                if (oldrep->rs_xid != req->rq_xid)
+                        continue;
+
+                if (oldrep->rs_opc != lustre_msg_get_opc(req->rq_reqmsg))
+                        CERROR ("Resent req xid "LPU64" has mismatched opc: "
+                                "new %d old %d\n", req->rq_xid,
+                                lustre_msg_get_opc(req->rq_reqmsg),
+                                oldrep->rs_opc);
+
+                svc = oldrep->rs_service;
+                spin_lock (&svc->srv_lock);
+
+                list_del_init (&oldrep->rs_exp_list);
+
+                CWARN("Stealing %d locks from rs %p x"LPD64".t"LPD64
+                      " o%d NID %s\n",
+                      oldrep->rs_nlocks, oldrep,
+                      oldrep->rs_xid, oldrep->rs_transno, oldrep->rs_opc,
+                      libcfs_nid2str(exp->exp_connection->c_peer.nid));
+
+                for (i = 0; i < oldrep->rs_nlocks; i++)
+                        ptlrpc_save_lock(req, &oldrep->rs_locks[i],
+                                         oldrep->rs_modes[i], 0);
+                oldrep->rs_nlocks = 0;
+
+                DEBUG_REQ(D_HA, req, "stole locks for");
+                spin_lock(&oldrep->rs_lock);
+                ptlrpc_schedule_difficult_reply (oldrep);
+                spin_unlock(&oldrep->rs_lock);
+
+                spin_unlock (&svc->srv_lock);
+                break;
+        }
+        spin_unlock(&exp->exp_lock);
+}
+
+/**
+ * VBR: restore versions
+ */
+void mdt_vbr_reconstruct(struct ptlrpc_request *req,
+                         struct lsd_client_data *lcd)
+{
+        __u64 pre_versions[4] = {0};
+        pre_versions[0] = lcd->lcd_pre_versions[0];
+        pre_versions[1] = lcd->lcd_pre_versions[1];
+        pre_versions[2] = lcd->lcd_pre_versions[2];
+        pre_versions[3] = lcd->lcd_pre_versions[3];
+        lustre_msg_set_versions(req->rq_repmsg, pre_versions);
+}
+
+void mdt_req_from_lcd(struct ptlrpc_request *req,
+                      struct lsd_client_data *lcd)
 {
         DEBUG_REQ(D_HA, req, "restoring transno "LPD64"/status %d",
-                  mcd->mcd_last_transno, mcd->mcd_last_result);
+                  lcd->lcd_last_transno, lcd->lcd_last_result);
 
         if (lustre_msg_get_opc(req->rq_reqmsg) == MDS_CLOSE ||
             lustre_msg_get_opc(req->rq_repmsg) == MDS_DONE_WRITING) {
-                req->rq_transno = mcd->mcd_last_close_transno;
-                req->rq_status = mcd->mcd_last_close_result;
-                lustre_msg_set_transno(req->rq_repmsg, req->rq_transno);
-                lustre_msg_set_status(req->rq_repmsg, req->rq_status);
+                req->rq_transno = lcd->lcd_last_close_transno;
+                req->rq_status = lcd->lcd_last_close_result;
         } else {
-                req->rq_transno = mcd->mcd_last_transno;
-                req->rq_status = mcd->mcd_last_result;
-                lustre_msg_set_transno(req->rq_repmsg, req->rq_transno);
-                lustre_msg_set_status(req->rq_repmsg, req->rq_status);
+                req->rq_transno = lcd->lcd_last_transno;
+                req->rq_status = lcd->lcd_last_result;
+                mdt_vbr_reconstruct(req, lcd);
         }
-        mds_steal_ack_locks(req);
+        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);
+
+        mdt_steal_ack_locks(req);
 }
 
 void mdt_reconstruct_generic(struct mdt_thread_info *mti,
@@ -1028,35 +1102,49 @@ void mdt_reconstruct_generic(struct mdt_thread_info *mti,
         struct ptlrpc_request *req = mdt_info_req(mti);
         struct mdt_export_data *med = &req->rq_export->exp_mdt_data;
 
-        return mdt_req_from_mcd(req, med->med_mcd);
+        return mdt_req_from_lcd(req, med->med_lcd);
 }
 
 static void mdt_reconstruct_create(struct mdt_thread_info *mti,
                                    struct mdt_lock_handle *lhc)
 {
         struct ptlrpc_request  *req = mdt_info_req(mti);
-        struct mdt_export_data *med = &req->rq_export->exp_mdt_data;
+        struct obd_export *exp = req->rq_export;
+        struct mdt_export_data *med = &exp->exp_mdt_data;
         struct mdt_device *mdt = mti->mti_mdt;
         struct mdt_object *child;
         struct mdt_body *body;
         int rc;
 
-        mdt_req_from_mcd(req, med->med_mcd);
+        mdt_req_from_lcd(req, med->med_lcd);
         if (req->rq_status)
                 return;
 
         /* if no error, so child was created with requested fid */
         child = mdt_object_find(mti->mti_env, mdt, mti->mti_rr.rr_fid2);
-        LASSERT(!IS_ERR(child));
+        if (IS_ERR(child)) {
+                rc = PTR_ERR(child);
+                LCONSOLE_WARN("Child "DFID" lookup error %d."
+                              " Evicting client %s with export %s.\n",
+                              PFID(mdt_object_fid(child)), rc,
+                              obd_uuid2str(&exp->exp_client_uuid),
+                              obd_export_nid2str(exp));
+                mdt_export_evict(exp);
+                EXIT;
+                return;
+        }
 
         body = req_capsule_server_get(mti->mti_pill, &RMF_MDT_BODY);
+        mti->mti_attr.ma_need = MA_INODE;
+        mti->mti_attr.ma_valid = 0;
         rc = mo_attr_get(mti->mti_env, mdt_object_child(child), &mti->mti_attr);
         if (rc == -EREMOTE) {
                 /* object was created on remote server */
                 req->rq_status = rc;
                 body->valid |= OBD_MD_MDS;
         }
-        mdt_pack_attr2body(mti, body, &mti->mti_attr.ma_attr, mdt_object_fid(child));
+        mdt_pack_attr2body(mti, body, &mti->mti_attr.ma_attr,
+                           mdt_object_fid(child));
         mdt_object_put(mti->mti_env, child);
 }
 
@@ -1064,18 +1152,31 @@ static void mdt_reconstruct_setattr(struct mdt_thread_info *mti,
                                     struct mdt_lock_handle *lhc)
 {
         struct ptlrpc_request  *req = mdt_info_req(mti);
-        struct mdt_export_data *med = &req->rq_export->exp_mdt_data;
+        struct obd_export *exp = req->rq_export;
+        struct mdt_export_data *med = &exp->exp_mdt_data;
         struct mdt_device *mdt = mti->mti_mdt;
         struct mdt_object *obj;
         struct mdt_body *body;
 
-        mdt_req_from_mcd(req, med->med_mcd);
+        mdt_req_from_lcd(req, med->med_lcd);
         if (req->rq_status)
                 return;
 
         body = req_capsule_server_get(mti->mti_pill, &RMF_MDT_BODY);
         obj = mdt_object_find(mti->mti_env, mdt, mti->mti_rr.rr_fid1);
-        LASSERT(!IS_ERR(obj));
+        if (IS_ERR(obj)) {
+                int rc = PTR_ERR(obj);
+                LCONSOLE_WARN(""DFID" lookup error %d."
+                              " Evicting client %s with export %s.\n",
+                              PFID(mdt_object_fid(obj)), rc,
+                              obd_uuid2str(&exp->exp_client_uuid),
+                              obd_export_nid2str(exp));
+                mdt_export_evict(exp);
+                EXIT;
+                return;
+        }
+        mti->mti_attr.ma_need = MA_INODE;
+        mti->mti_attr.ma_valid = 0;
         mo_attr_get(mti->mti_env, mdt_object_child(obj), &mti->mti_attr);
         mdt_pack_attr2body(mti, body, &mti->mti_attr.ma_attr,
                            mdt_object_fid(obj));
@@ -1098,13 +1199,6 @@ static void mdt_reconstruct_setattr(struct mdt_thread_info *mti,
         mdt_object_put(mti->mti_env, obj);
 }
 
-static void mdt_reconstruct_setxattr(struct mdt_thread_info *mti,
-                                     struct mdt_lock_handle *lhc)
-{
-        /* reply nothing */
-        req_capsule_shrink(mti->mti_pill, &RMF_EADATA, 0, RCL_SERVER);
-}
-
 typedef void (*mdt_reconstructor)(struct mdt_thread_info *mti,
                                   struct mdt_lock_handle *lhc);
 
@@ -1115,7 +1209,7 @@ static mdt_reconstructor reconstructors[REINT_MAX] = {
         [REINT_UNLINK]   = mdt_reconstruct_generic,
         [REINT_RENAME]   = mdt_reconstruct_generic,
         [REINT_OPEN]     = mdt_reconstruct_open,
-        [REINT_SETXATTR] = mdt_reconstruct_setxattr
+        [REINT_SETXATTR] = mdt_reconstruct_generic
 };
 
 void mdt_reconstruct(struct mdt_thread_info *mti,