Whamcloud - gitweb
b=22070 revert incompatible protocol change
[fs/lustre-release.git] / lustre / mdc / mdc_request.c
index 790852f..f84d849 100644 (file)
@@ -1,22 +1,37 @@
 /* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
  * vim:expandtab:shiftwidth=8:tabstop=8:
  *
- * Copyright (C) 2001-2004 Cluster File Systems, Inc.
+ * GPL HEADER START
  *
- *   This file is part of Lustre, http://www.sf.net/projects/lustre/
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *   Lustre is free 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.
+ * 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.
  *
- *   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
- *   GNU General Public License for more details.
+ * 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).
  *
- *   You should have received a copy of the GNU General Public License
- *   along with Lustre; if not, write to the Free Software
- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * 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
+ *
+ * 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.
  */
 
 #ifndef EXPORT_SYMTAB
 # include <liblustre.h>
 #endif
 
-#include <linux/obd_class.h>
-#include <linux/lustre_mds.h>
-#include <linux/lustre_dlm.h>
-#include <linux/lustre_sec.h>
-#include <linux/lprocfs_status.h>
-#include <linux/lustre_acl.h>
-#include <linux/lustre_lite.h>
-#include <linux/lustre_gs.h>
+#include <lustre_acl.h>
+#include <obd_class.h>
+#include <lustre_dlm.h>
+#include <lustre_fid.h>
+#include <md_object.h>
+#include <lprocfs_status.h>
+#include <lustre_param.h>
 #include "mdc_internal.h"
+#include <lustre/lustre_idl.h>
 
 #define REQUEST_MINOR 244
 
-static int mdc_cleanup(struct obd_device *obd, int flags);
+static quota_interface_t *quota_interface;
+extern quota_interface_t mdc_quota_interface;
+
+static int mdc_cleanup(struct obd_device *obd);
+
+int mdc_unpack_capa(struct obd_export *exp, struct ptlrpc_request *req,
+                    const struct req_msg_field *field, struct obd_capa **oc)
+{
+        struct lustre_capa *capa;
+        struct obd_capa *c;
+        ENTRY;
+
+        /* swabbed already in mdc_enqueue */
+        capa = req_capsule_server_get(&req->rq_pill, field);
+        if (capa == NULL)
+                RETURN(-EPROTO);
+
+        c = alloc_capa(CAPA_SITE_CLIENT);
+        if (IS_ERR(c)) {
+                CDEBUG(D_INFO, "alloc capa failed!\n");
+                RETURN(PTR_ERR(c));
+        } else {
+                c->c_capa = *capa;
+                *oc = c;
+                RETURN(0);
+        }
+}
 
-extern int mds_queue_req(struct ptlrpc_request *);
 /* Helper that implements most of mdc_getstatus and signal_completed_replay. */
 /* XXX this should become mdc_get_info("key"), sending MDS_GET_INFO RPC */
-static int send_getstatus(struct obd_import *imp, struct lustre_id *rootid,
-                          int level, int msg_flags)
+static int send_getstatus(struct obd_import *imp, struct lu_fid *rootfid,
+                          struct obd_capa **pc, int level, int msg_flags)
 {
         struct ptlrpc_request *req;
-        struct mds_body *body;
-        int rc, size[2] = {0, sizeof(*body)};
+        struct mdt_body       *body;
+        int                    rc;
         ENTRY;
 
-        //size[0] = lustre_secdesc_size();
-
-        req = ptlrpc_prep_req(imp, LUSTRE_MDS_VERSION, MDS_GETSTATUS,
-                              2, size, NULL);
-        if (!req)
-                GOTO(out, rc = -ENOMEM);
-
-        //lustre_pack_secdesc(req, size[0]);
+        req = ptlrpc_request_alloc_pack(imp, &RQF_MDS_GETSTATUS,
+                                        LUSTRE_MDS_VERSION, MDS_GETSTATUS);
+        if (req == NULL)
+                RETURN(-ENOMEM);
 
-        body = lustre_msg_buf(req->rq_reqmsg, MDS_REQ_REC_OFF, sizeof (*body));
+        mdc_pack_body(req, NULL, NULL, 0, 0, -1, 0);
+        lustre_msg_add_flags(req->rq_reqmsg, msg_flags);
         req->rq_send_state = level;
-        req->rq_replen = lustre_msg_size(1, &size[1]);
 
-        req->rq_reqmsg->flags |= msg_flags;
-        rc = ptlrpc_queue_wait(req);
+        ptlrpc_request_set_replen(req);
 
-        if (!rc) {
-                body = lustre_swab_repbuf (req, 0, sizeof (*body),
-                                           lustre_swab_mds_body);
-                if (body == NULL) {
-                        CERROR ("Can't extract mds_body\n");
-                        GOTO (out, rc = -EPROTO);
-                }
+        rc = ptlrpc_queue_wait(req);
+        if (rc)
+                GOTO(out, rc);
 
-                memcpy(rootid, &body->id1, sizeof(*rootid));
+        body = req_capsule_server_get(&req->rq_pill, &RMF_MDT_BODY);
+        if (body == NULL)
+                GOTO(out, rc = -EPROTO);
 
-                CDEBUG(D_NET, "root ino="LPU64", last_committed="LPU64
-                       ", last_xid="LPU64"\n", rootid->li_stc.u.e3s.l3s_ino,
-                       req->rq_repmsg->last_committed, req->rq_repmsg->last_xid);
+        if (body->valid & OBD_MD_FLMDSCAPA) {
+                rc = mdc_unpack_capa(NULL, req, &RMF_CAPA1, pc);
+                if (rc)
+                        GOTO(out, rc);
         }
 
+        *rootfid = body->fid1;
+        CDEBUG(D_NET,
+               "root fid="DFID", last_committed="LPU64"\n",
+               PFID(rootfid),
+               lustre_msg_get_last_committed(req->rq_repmsg));
         EXIT;
- out:
+out:
         ptlrpc_req_finished(req);
         return rc;
 }
 
-/* This should be mdc_get_info("rootid") */
-int mdc_getstatus(struct obd_export *exp, struct lustre_id *rootid)
+/* This should be mdc_get_info("rootfid") */
+int mdc_getstatus(struct obd_export *exp, struct lu_fid *rootfid,
+                  struct obd_capa **pc)
 {
-        return send_getstatus(class_exp2cliimp(exp), rootid,
+        return send_getstatus(class_exp2cliimp(exp), rootfid, pc,
                               LUSTRE_IMP_FULL, 0);
 }
 
-int
-mdc_interpret_getattr(struct ptlrpc_request *req, void *unused, int rc)
+/*
+ * This function now is known to always saying that it will receive 4 buffers
+ * from server. Even for cases when acl_size and md_size is zero, RPC header
+ * will contain 4 fields and RPC itself will contain zero size fields. This is
+ * because mdt_getattr*() _always_ returns 4 fields, but if acl is not needed
+ * and thus zero, it shrinks it, making zero size. The same story about
+ * md_size. And this is course of problem when client waits for smaller number
+ * of fields. This issue will be fixed later when client gets aware of RPC
+ * layouts.  --umka
+ */
+static int mdc_getattr_common(struct obd_export *exp,
+                              struct ptlrpc_request *req)
 {
-        struct mds_body *body = NULL;
-        struct obd_capa *ocapa;
-        struct lustre_capa *capa = NULL;
-        unsigned long expiry;
+        struct req_capsule *pill = &req->rq_pill;
+        struct mdt_body    *body;
+        void               *eadata;
+        int                 rc;
         ENTRY;
 
-        if (rc) {
-                DEBUG_REQ(rc == -ENOENT ? D_INFO : D_ERROR , req,
-                          "async getattr failed: rc = %d", rc);
+        /* Request message already built. */
+        rc = ptlrpc_queue_wait(req);
+        if (rc != 0)
                 RETURN(rc);
-        }
 
-        body = lustre_swab_repbuf(req, 0, sizeof (*body), lustre_swab_mds_body);
-        if (body == NULL) {
-                CERROR ("Can't unpack mds_body\n");
+        /* sanity check for the reply */
+        body = req_capsule_server_get(pill, &RMF_MDT_BODY);
+        if (body == NULL)
                 RETURN(-EPROTO);
-        }
-
-        if (!(body->valid & OBD_MD_CAPA)) {
-                CDEBUG(D_INFO, "MDS has disabled capability\n");
-                RETURN(0);
-        }
 
-        capa = lustre_swab_repbuf(req, 1, sizeof(*capa),
-                                  lustre_swab_lustre_capa);
-        if (capa == NULL && rc != 0) {
-                CERROR ("Can't unpack lustre_capa\n");
-                RETURN(-EPROTO);
-        }
+        CDEBUG(D_NET, "mode: %o\n", body->mode);
 
-        ocapa = capa_renew(capa, CLIENT_CAPA);
-        if (!ocapa)
-                RETURN(-ENOENT);
+        if (body->eadatasize != 0) {
+                mdc_update_max_ea_from_body(exp, body);
 
-        spin_lock(&capa_lock);
-        expiry = expiry_to_jiffies(capa->lc_expiry - capa_pre_expiry(capa));
-        CDEBUG(D_INFO, "expiry %lu vs timer %lu, base %p\n",
-               expiry, ll_capa_timer.expires, ll_capa_timer.base);
-        if (time_before(expiry, ll_capa_timer.expires) ||
-            !timer_pending(&ll_capa_timer)) {
-                mod_timer(&ll_capa_timer, expiry);
-                CDEBUG(D_INFO, "ll_capa_timer new expiry: %lu\n", expiry);
+                eadata = req_capsule_server_sized_get(pill, &RMF_MDT_MD,
+                                                      body->eadatasize);
+                if (eadata == NULL)
+                        RETURN(-EPROTO);
         }
-        spin_unlock(&capa_lock);
 
-        RETURN(rc);
-}
+        if (body->valid & OBD_MD_FLRMTPERM) {
+                struct mdt_remote_perm *perm;
 
-int mdc_getattr_async(struct obd_export *exp, struct ptlrpc_request *req)
-{
-        int repsize[2] = {sizeof(struct mds_body), sizeof(struct lustre_capa)};
-        ENTRY;
+                LASSERT(client_is_remote(exp));
+                perm = req_capsule_server_swab_get(pill, &RMF_ACL,
+                                                lustre_swab_mdt_remote_perm);
+                if (perm == NULL)
+                        RETURN(-EPROTO);
+        }
 
-        req->rq_replen = lustre_msg_size(2, repsize);
-        req->rq_interpret_reply = mdc_interpret_getattr;
-        ptlrpcd_add_req(req);
+        if (body->valid & OBD_MD_FLMDSCAPA) {
+                struct lustre_capa *capa;
+                capa = req_capsule_server_get(pill, &RMF_CAPA1);
+                if (capa == NULL)
+                        RETURN(-EPROTO);
+        }
 
-        RETURN (0);
+        RETURN(0);
 }
 
-int mdc_getattr_common(struct obd_export *exp, unsigned int ea_size,
-                       struct ptlrpc_request *req)
+int mdc_getattr(struct obd_export *exp, struct md_op_data *op_data,
+                struct ptlrpc_request **request)
 {
-        struct mds_body *body, *reqbody;
-        void            *eadata;
-        int              rc;
-        int              repsize[2] = {sizeof(*body)};
-        int              bufcount = 1;
+        struct ptlrpc_request *req;
+        int                    rc;
         ENTRY;
 
-        /* request message already built */
-
-        if (ea_size != 0) {
-                repsize[bufcount++] = ea_size;
-                CDEBUG(D_INODE, "reserved %u bytes for MD/symlink in packet\n",
-                       ea_size);
-        }
-
-        reqbody = lustre_msg_buf(req->rq_reqmsg, 1, sizeof(*reqbody));
-        LASSERT(!(reqbody->valid & OBD_MD_FLACL));
-
-        if (reqbody->valid & OBD_MD_FLKEY) {
-                repsize[bufcount++] = 5;
-                repsize[bufcount++] = sizeof(struct lustre_key);
-        } else if (reqbody->valid & OBD_MD_CAPA) {
-                LASSERT(ea_size == 0);
-                repsize[bufcount++] = sizeof(struct lustre_capa);
-        }
-
-        req->rq_replen = lustre_msg_size(bufcount, repsize);
+        *request = NULL;
+        req = ptlrpc_request_alloc(class_exp2cliimp(exp), &RQF_MDS_GETATTR);
+        if (req == NULL)
+                RETURN(-ENOMEM);
 
-        mdc_get_rpc_lock(exp->exp_obd->u.cli.cl_rpc_lock, NULL);
-        rc = ptlrpc_queue_wait(req);
-        mdc_put_rpc_lock(exp->exp_obd->u.cli.cl_rpc_lock, NULL);
-        if (rc != 0)
-                RETURN (rc);
+        mdc_set_capa_size(req, &RMF_CAPA1, op_data->op_capa1);
 
-        body = lustre_swab_repbuf (req, 0, sizeof (*body),
-                                   lustre_swab_mds_body);
-        if (body == NULL) {
-                CERROR ("Can't unpack mds_body\n");
-                RETURN (-EPROTO);
+        rc = ptlrpc_request_pack(req, LUSTRE_MDS_VERSION, MDS_GETATTR);
+        if (rc) {
+                ptlrpc_request_free(req);
+                RETURN(rc);
         }
 
-        CDEBUG(D_NET, "mode: %o\n", body->mode);
+        mdc_pack_body(req, &op_data->op_fid1, op_data->op_capa1,
+                      op_data->op_valid, op_data->op_mode, -1, 0);
 
-        LASSERT_REPSWAB (req, 1);
-
-        /* Skip the check if getxattr/listxattr are called with no buffers */
-        if ((reqbody->eadatasize != 0) &&
-            !(reqbody->valid & (OBD_MD_FLXATTR | OBD_MD_FLXATTRLIST))) {
-                /* reply indicates presence of eadata; check it's there... */
-                eadata = lustre_msg_buf (req->rq_repmsg, 1,
-                                         body->eadatasize);
-                if (eadata == NULL) {
-                        CERROR ("Missing/short eadata\n");
-                        RETURN (-EPROTO);
-                }
+        req_capsule_set_size(&req->rq_pill, &RMF_MDT_MD, RCL_SERVER,
+                             op_data->op_mode);
+        if (op_data->op_valid & OBD_MD_FLRMTPERM) {
+                LASSERT(client_is_remote(exp));
+                req_capsule_set_size(&req->rq_pill, &RMF_ACL, RCL_SERVER,
+                                     sizeof(struct mdt_remote_perm));
         }
+        ptlrpc_request_set_replen(req);
 
-        RETURN (0);
-}
-
-static int mdc_cancel_unused(struct obd_export *exp,
-                             struct lov_stripe_md *lsm, 
-                            int flags, void *opaque)
-{
-        struct obd_device *obd = class_exp2obd(exp);
-
-        ENTRY;
-        RETURN(ldlm_cli_cancel_unused(obd->obd_namespace,
-                                      NULL, flags, opaque));
+        rc = mdc_getattr_common(exp, req);
+        if (rc)
+                ptlrpc_req_finished(req);
+        else
+                *request = req;
+        RETURN(rc);
 }
 
-int mdc_getattr(struct obd_export *exp, struct lustre_id *id,
-                __u64 valid, const char *xattr_name,
-                const void *xattr_data, unsigned int xattr_datalen,
-                unsigned int ea_size, struct obd_capa *ocapa,
-                struct ptlrpc_request **request)
+int mdc_getattr_name(struct obd_export *exp, struct md_op_data *op_data,
+                     struct ptlrpc_request **request)
 {
         struct ptlrpc_request *req;
-        struct mds_body *body;
-        int xattr_namelen = xattr_name ? strlen(xattr_name) + 1 : 0;
-        int size[4] = {0, sizeof(*body)};
-        int bufcount = 2;
-        int rc;
+        int                    rc;
         ENTRY;
 
-        size[0] = lustre_secdesc_size();
+        *request = NULL;
+        req = ptlrpc_request_alloc(class_exp2cliimp(exp),
+                                   &RQF_MDS_GETATTR_NAME);
+        if (req == NULL)
+                RETURN(-ENOMEM);
 
-        if (valid & OBD_MD_FLXATTR) {
-                size[bufcount++] = xattr_namelen;
+        mdc_set_capa_size(req, &RMF_CAPA1, op_data->op_capa1);
+        req_capsule_set_size(&req->rq_pill, &RMF_NAME, RCL_CLIENT,
+                             op_data->op_namelen + 1);
 
-                if (xattr_datalen > 0) {
-                        LASSERT(xattr_data);
-                        size[bufcount++] = xattr_datalen;
-                }
-        } else if (valid & OBD_MD_CAPA) {
-                LASSERT(valid  == OBD_MD_CAPA);
-                LASSERT(ocapa);
-                size[bufcount++] = sizeof(*ocapa);
-        } else {
-                LASSERT(!xattr_data && !xattr_datalen);
+        rc = ptlrpc_request_pack(req, LUSTRE_MDS_VERSION, MDS_GETATTR_NAME);
+        if (rc) {
+                ptlrpc_request_free(req);
+                RETURN(rc);
         }
 
-        req = ptlrpc_prep_req(class_exp2cliimp(exp), LUSTRE_MDS_VERSION,
-                              MDS_GETATTR, bufcount, size, NULL);
-        if (!req)
-                GOTO(out, rc = -ENOMEM);
-
-        lustre_pack_secdesc(req, size[0]);
-
-        body = lustre_msg_buf(req->rq_reqmsg, MDS_REQ_REC_OFF, sizeof (*body));
-        memcpy(&body->id1, id, sizeof(*id));
-        body->valid = valid;
-        body->eadatasize = ea_size;
+        mdc_pack_body(req, &op_data->op_fid1, op_data->op_capa1,
+                      op_data->op_valid, op_data->op_mode,
+                      op_data->op_suppgids[0], 0);
 
-        if (valid & OBD_MD_FLXATTR) {
-                memcpy(lustre_msg_buf(req->rq_reqmsg, 2, xattr_namelen),
-                       xattr_name, xattr_namelen);
-                if (xattr_datalen)
-                        memcpy(lustre_msg_buf(req->rq_reqmsg, 3, xattr_datalen),
-                               xattr_data, xattr_datalen);
+        if (op_data->op_name) {
+                char *name = req_capsule_client_get(&req->rq_pill, &RMF_NAME);
+                LASSERT(strnlen(op_data->op_name, op_data->op_namelen) ==
+                                op_data->op_namelen);
+                memcpy(name, op_data->op_name, op_data->op_namelen);
         }
 
-        if (valid & OBD_MD_CAPA) {
-                /* renew capability */
-                memcpy(&body->handle, &ocapa->c_handle, sizeof(body->handle));
-                memcpy(lustre_msg_buf(req->rq_reqmsg, 2, sizeof(ocapa->c_capa)),
-                       &ocapa->c_capa, sizeof(ocapa->c_capa));
+        req_capsule_set_size(&req->rq_pill, &RMF_MDT_MD, RCL_SERVER,
+                             op_data->op_mode);
+        ptlrpc_request_set_replen(req);
 
-                rc = mdc_getattr_async(exp, req);
-                req = NULL;     /* ptlrpcd will finish request */
-        } else {
-                rc = mdc_getattr_common(exp, ea_size, req);
-                if (rc != 0) {
-                        ptlrpc_req_finished (req);
-                        req = NULL;
-                }
-        }
- out:
-        *request = req;
-        RETURN (rc);
+        rc = mdc_getattr_common(exp, req);
+        if (rc)
+                ptlrpc_req_finished(req);
+        else
+                *request = req;
+        RETURN(rc);
 }
 
-int mdc_access_check(struct obd_export *exp, struct lustre_id *id,
-                     struct ptlrpc_request **request)
-
+static int mdc_is_subdir(struct obd_export *exp,
+                         const struct lu_fid *pfid,
+                         const struct lu_fid *cfid,
+                         struct ptlrpc_request **request)
 {
-        struct ptlrpc_request *req;
-        struct mds_body *body;
-        int size[2] = {0, sizeof(*body)};
-        int rc;
-        ENTRY;
+        struct ptlrpc_request  *req;
+        int                     rc;
 
-        size[0] = lustre_secdesc_size();
-        req = ptlrpc_prep_req(class_exp2cliimp(exp), LUSTRE_MDS_VERSION,
-                              MDS_ACCESS_CHECK, 2, size, NULL);
-        if (!req)
-                GOTO(out, rc = -ENOMEM);
+        ENTRY;
 
-        lustre_pack_secdesc(req, size[0]);
-        body = lustre_msg_buf(req->rq_reqmsg, MDS_REQ_REC_OFF, sizeof (*body));
-        memcpy(&body->id1, id, sizeof(*id));
+        *request = NULL;
+        req = ptlrpc_request_alloc_pack(class_exp2cliimp(exp),
+                                        &RQF_MDS_IS_SUBDIR, LUSTRE_MDS_VERSION,
+                                        MDS_IS_SUBDIR);
+        if (req == NULL)
+                RETURN(-ENOMEM);
 
-        size[0] = sizeof(*body);
-        size[1] = sizeof(struct mds_remote_perm);
-        req->rq_replen = lustre_msg_size(2, size);
+        mdc_is_subdir_pack(req, pfid, cfid, 0);
+        ptlrpc_request_set_replen(req);
 
-        mdc_get_rpc_lock(exp->exp_obd->u.cli.cl_rpc_lock, NULL);
         rc = ptlrpc_queue_wait(req);
-        mdc_put_rpc_lock(exp->exp_obd->u.cli.cl_rpc_lock, NULL);
-        if (rc != 0) {
-                ptlrpc_req_finished (req);
-                req = NULL;
-        } else {
-                body = lustre_swab_repbuf (req, 0, sizeof (*body),
-                                           lustre_swab_mds_body);
-                if (body == NULL) {
-                        CERROR ("Can't unpack mds_body\n");
-                        RETURN (-EPROTO);
-                }
-        }
-
- out:
-        *request = req;
-        RETURN (rc);
+        if (rc && rc != -EREMOTE)
+                ptlrpc_req_finished(req);
+        else
+                *request = req;
+        RETURN(rc);
 }
 
-int mdc_getattr_lock(struct obd_export *exp, struct lustre_id *id,
-                     char *filename, int namelen, __u64 valid,
-                     unsigned int ea_size, struct ptlrpc_request **request)
+static int mdc_xattr_common(struct obd_export *exp,const struct req_format *fmt,
+                            const struct lu_fid *fid,
+                            struct obd_capa *oc, int opcode, obd_valid valid,
+                            const char *xattr_name, const char *input,
+                            int input_size, int output_size, int flags,
+                            __u32 suppgid, struct ptlrpc_request **request)
 {
         struct ptlrpc_request *req;
-        struct mds_body *body;
-        int rc, size[3] = {0, sizeof(*body), namelen};
+        int   xattr_namelen = 0;
+        char *tmp;
+        int   rc;
         ENTRY;
 
-        size[0] = lustre_secdesc_size();
-
-        req = ptlrpc_prep_req(class_exp2cliimp(exp), LUSTRE_MDS_VERSION,
-                              MDS_GETATTR_LOCK, 3, size, NULL);
-        if (!req)
-                GOTO(out, rc = -ENOMEM);
+        *request = NULL;
+        req = ptlrpc_request_alloc(class_exp2cliimp(exp), fmt);
+        if (req == NULL)
+                RETURN(-ENOMEM);
 
-        lustre_pack_secdesc(req, size[0]);
+        mdc_set_capa_size(req, &RMF_CAPA1, oc);
+        if (xattr_name) {
+                xattr_namelen = strlen(xattr_name) + 1;
+                req_capsule_set_size(&req->rq_pill, &RMF_NAME, RCL_CLIENT,
+                                     xattr_namelen);
+        }
+        if (input_size) {
+                LASSERT(input);
+                req_capsule_set_size(&req->rq_pill, &RMF_EADATA, RCL_CLIENT,
+                                     input_size);
+        }
 
-        body = lustre_msg_buf(req->rq_reqmsg, MDS_REQ_REC_OFF, sizeof (*body));
-        memcpy(&body->id1, id, sizeof(*id));
-        body->valid = valid;
-        body->eadatasize = ea_size;
+        rc = ptlrpc_request_pack(req, LUSTRE_MDS_VERSION, opcode);
+        if (rc) {
+                ptlrpc_request_free(req);
+                RETURN(rc);
+        }
 
-        if (filename != NULL) {
-                LASSERT (strnlen (filename, namelen) == namelen - 1);
-                memcpy(lustre_msg_buf(req->rq_reqmsg, 2, namelen),
-                       filename, namelen);
+        if (opcode == MDS_REINT) {
+                struct mdt_rec_setxattr *rec;
+
+                CLASSERT(sizeof(struct mdt_rec_setxattr) ==
+                         sizeof(struct mdt_rec_reint));
+                rec = req_capsule_client_get(&req->rq_pill, &RMF_REC_REINT);
+                rec->sx_opcode = REINT_SETXATTR;
+                /* TODO:
+                 *  cfs_curproc_fs{u,g}id() should replace
+                 *  current->fs{u,g}id for portability.
+                 */
+                rec->sx_fsuid  = cfs_curproc_fsuid();
+                rec->sx_fsgid  = cfs_curproc_fsgid();
+                rec->sx_cap    = cfs_curproc_cap_pack();
+                rec->sx_suppgid1 = suppgid;
+                rec->sx_suppgid2 = -1;
+                rec->sx_fid    = *fid;
+                rec->sx_valid  = valid | OBD_MD_FLCTIME;
+                rec->sx_time   = cfs_time_current_sec();
+                rec->sx_size   = output_size;
+                rec->sx_flags  = flags;
+
+                mdc_pack_capa(req, &RMF_CAPA1, oc);
         } else {
-                LASSERT(namelen == 1);
+                mdc_pack_body(req, fid, oc, valid, output_size, suppgid, flags);
         }
 
-        rc = mdc_getattr_common(exp, ea_size, req);
-        if (rc != 0) {
-                ptlrpc_req_finished (req);
-                req = NULL;
+        if (xattr_name) {
+                tmp = req_capsule_client_get(&req->rq_pill, &RMF_NAME);
+                memcpy(tmp, xattr_name, xattr_namelen);
         }
- out:
-        *request = req;
+        if (input_size) {
+                tmp = req_capsule_client_get(&req->rq_pill, &RMF_EADATA);
+                memcpy(tmp, input, input_size);
+        }
+
+        if (req_capsule_has_field(&req->rq_pill, &RMF_EADATA, RCL_SERVER))
+                req_capsule_set_size(&req->rq_pill, &RMF_EADATA,
+                                     RCL_SERVER, output_size);
+        ptlrpc_request_set_replen(req);
+
+        /* make rpc */
+        if (opcode == MDS_REINT)
+                mdc_get_rpc_lock(exp->exp_obd->u.cli.cl_rpc_lock, NULL);
+
+        rc = ptlrpc_queue_wait(req);
+
+        if (opcode == MDS_REINT)
+                mdc_put_rpc_lock(exp->exp_obd->u.cli.cl_rpc_lock, NULL);
+
+        if (rc)
+                ptlrpc_req_finished(req);
+        else
+                *request = req;
         RETURN(rc);
 }
 
-/* This should be called with both the request and the reply still packed. */
-int mdc_store_inode_generation(struct obd_export *exp,
-                               struct ptlrpc_request *req,
-                               int reqoff, int repoff)
+int mdc_setxattr(struct obd_export *exp, const struct lu_fid *fid,
+                 struct obd_capa *oc, obd_valid valid, const char *xattr_name,
+                 const char *input, int input_size, int output_size,
+                 int flags, __u32 suppgid, struct ptlrpc_request **request)
 {
-        struct mds_rec_create *rec =
-                lustre_msg_buf(req->rq_reqmsg, reqoff, sizeof(*rec));
-        struct mds_body *body =
-                lustre_msg_buf(req->rq_repmsg, repoff, sizeof(*body));
-
-        LASSERT (rec != NULL);
-        LASSERT (body != NULL);
+        return mdc_xattr_common(exp, &RQF_MDS_REINT_SETXATTR,
+                                fid, oc, MDS_REINT, valid, xattr_name,
+                                input, input_size, output_size, flags,
+                                suppgid, request);
+}
 
-        memcpy(&rec->cr_replayid, &body->id1, sizeof(rec->cr_replayid));
-        DEBUG_REQ(D_HA, req, "storing generation for ino "DLID4,
-                  OLID4(&rec->cr_replayid));
-        return 0;
+int mdc_getxattr(struct obd_export *exp, const struct lu_fid *fid,
+                 struct obd_capa *oc, obd_valid valid, const char *xattr_name,
+                 const char *input, int input_size, int output_size,
+                 int flags, struct ptlrpc_request **request)
+{
+        return mdc_xattr_common(exp, &RQF_MDS_GETXATTR,
+                                fid, oc, MDS_GETXATTR, valid, xattr_name,
+                                input, input_size, output_size, flags,
+                                -1, request);
 }
 
-static
-int mdc_unpack_acl(struct obd_export *exp_lmv, struct ptlrpc_request *req, 
-                   unsigned int offset, struct lustre_md *md)
+#ifdef CONFIG_FS_POSIX_ACL
+static int mdc_unpack_acl(struct ptlrpc_request *req, struct lustre_md *md)
 {
-        struct posix_acl *acl;
-        struct mds_remote_perm *perm;
-        int    size, rc;
-        void  *buf;
+        struct req_capsule     *pill = &req->rq_pill;
+        struct mdt_body        *body = md->body;
+        struct posix_acl       *acl;
+        void                   *buf;
+        int                     rc;
         ENTRY;
-        if (!(md->body->valid & OBD_MD_FLACL))
+
+        if (!body->aclsize)
                 RETURN(0);
 
-        if (md->body->valid & OBD_MD_FLRMTACL) {
-                offset++; /* first 'size' is not used */
+        buf = req_capsule_server_sized_get(pill, &RMF_ACL, body->aclsize);
 
-                buf = lustre_swab_repbuf(req, offset, sizeof(*perm),
-                                         lustre_swab_remote_perm);
-                if (buf == NULL) {
-                        CERROR("Can't unpack remote perm\n");
-                        RETURN(-EFAULT);
-                }
+        if (!buf)
+                RETURN(-EPROTO);
 
-                OBD_ALLOC(perm, sizeof(*perm));
-                if (!perm)
-                        RETURN(-ENOMEM);
-                memcpy(perm, buf, sizeof(*perm));
-                md->remote_perm = perm;
-        } else {
-                size = le32_to_cpu(*(__u32 *) lustre_msg_buf(
-                                   req->rq_repmsg, offset, 4));
-                buf = lustre_msg_buf(req->rq_repmsg, offset + 1, size);
-
-                acl = posix_acl_from_xattr(buf, size);
-                if (IS_ERR(acl)) {
-                        rc = PTR_ERR(acl);
-                        CERROR("convert xattr to acl failed: %d\n", rc);
-                        RETURN(rc);
-                } else if (acl) {
-                        rc = posix_acl_valid(acl);
-                        if (rc) {
-                                CERROR("acl valid error: %d\n", rc);
-                                posix_acl_release(acl);
-                                RETURN(rc);
-                        }
-                }
+        acl = posix_acl_from_xattr(buf, body->aclsize);
+        if (IS_ERR(acl)) {
+                rc = PTR_ERR(acl);
+                CERROR("convert xattr to acl: %d\n", rc);
+                RETURN(rc);
+        }
 
-                md->posix_acl = acl;
+        rc = posix_acl_valid(acl);
+        if (rc) {
+                CERROR("validate acl: %d\n", rc);
+                posix_acl_release(acl);
+                RETURN(rc);
         }
 
+        md->posix_acl = acl;
         RETURN(0);
 }
+#else
+#define mdc_unpack_acl(req, md) 0
+#endif
 
-static int mdc_unpack_gskey(struct obd_export *exp_lmv, struct ptlrpc_request *req, 
-                            unsigned int *offset, struct lustre_md *md)
-{ 
-        int key_off = 0, rc = 0, size = 0;
-        void *buf;
-        
-        key_off = *offset;
-        if (md->body->valid & OBD_MD_FLKEY) {
-                size = le32_to_cpu(*(__u32 *) lustre_msg_buf(req->rq_repmsg, 
-                                   key_off++, 4));
-                buf = lustre_msg_buf(req->rq_repmsg, key_off++, size);
-                
-                CDEBUG(D_INFO, "buf %p key_off %d size %d \n", 
-                       buf, key_off, size);
-                md->key = (struct lustre_key *)buf; 
-                *offset = key_off; 
-        } else {
-                *offset += 2;
-        } 
-        RETURN(rc);
-}
-
-int mdc_req2lustre_md(struct obd_export *exp_lmv, struct ptlrpc_request *req, 
-                      unsigned int offset, struct obd_export *exp_lov, 
+int mdc_get_lustre_md(struct obd_export *exp, struct ptlrpc_request *req,
+                      struct obd_export *dt_exp, struct obd_export *md_exp,
                       struct lustre_md *md)
 {
-        struct lov_mds_md *lmm;
-        int rc = 0, reply_off;
+        struct req_capsule *pill = &req->rq_pill;
+        int rc;
         ENTRY;
 
-        LASSERT(md != NULL);
+        LASSERT(md);
         memset(md, 0, sizeof(*md));
 
-        md->body = lustre_msg_buf(req->rq_repmsg, offset,
-                                  sizeof(*md->body));
-        if (!md->body)
-                RETURN(-ENOMEM);
+        md->body = req_capsule_server_get(pill, &RMF_MDT_BODY);
+        LASSERT(md->body != NULL);
 
-        LASSERT_REPSWABBED(req, offset);
+        if (md->body->valid & OBD_MD_FLEASIZE) {
+                int lmmsize;
+                struct lov_mds_md *lmm;
 
-        if (!(md->body->valid & OBD_MD_FLEASIZE) &&
-            !(md->body->valid & OBD_MD_FLDIREA))
-                RETURN(0);
+                if (!S_ISREG(md->body->mode)) {
+                        CDEBUG(D_INFO, "OBD_MD_FLEASIZE set, should be a "
+                               "regular file, but is not\n");
+                        GOTO(out, rc = -EPROTO);
+                }
 
-        if (S_ISREG(md->body->mode)) {
                 if (md->body->eadatasize == 0) {
-                        CERROR("invalid EA size (0) is detected\n");
-                        RETURN(-EPROTO);
+                        CDEBUG(D_INFO, "OBD_MD_FLEASIZE set, "
+                               "but eadatasize 0\n");
+                        GOTO(out, rc = -EPROTO);
                 }
-
-                lmm = lustre_msg_buf(req->rq_repmsg, offset + 1,
-                                     md->body->eadatasize);
+                lmmsize = md->body->eadatasize;
+                lmm = req_capsule_server_sized_get(pill, &RMF_MDT_MD, lmmsize);
                 if (!lmm)
-                        RETURN(-EINVAL);
+                        GOTO(out, rc = -EPROTO);
 
-                LASSERT(exp_lov != NULL);
-                
-                rc = obd_unpackmd(exp_lov, &md->lsm, lmm,
-                                  md->body->eadatasize);
-                if (rc > 0) {
-                        LASSERT(rc >= sizeof(*md->lsm));
-                        rc = 0;
+                rc = obd_unpackmd(dt_exp, &md->lsm, lmm, lmmsize);
+                if (rc < 0)
+                        GOTO(out, rc);
+
+                if (rc < sizeof(*md->lsm)) {
+                        CDEBUG(D_INFO, "lsm size too small: "
+                               "rc < sizeof (*md->lsm) (%d < %d)\n",
+                               rc, (int)sizeof(*md->lsm));
+                        GOTO(out, rc = -EPROTO);
                 }
-        } else if (S_ISDIR(md->body->mode)) {
-                /* dir can be non-splitted */
-                if (md->body->eadatasize == 0)
-                        RETURN(0);
 
-                lmm = lustre_msg_buf(req->rq_repmsg, offset + 1,
-                                     md->body->eadatasize);
-                if (!lmm)
-                        RETURN(-EINVAL);
+        } else if (md->body->valid & OBD_MD_FLDIREA) {
+                int lmvsize;
+                struct lov_mds_md *lmv;
+
+                if(!S_ISDIR(md->body->mode)) {
+                        CDEBUG(D_INFO, "OBD_MD_FLDIREA set, should be a "
+                               "directory, but is not\n");
+                        GOTO(out, rc = -EPROTO);
+                }
 
+                if (md->body->eadatasize == 0) {
+                        CDEBUG(D_INFO, "OBD_MD_FLDIREA is set, "
+                               "but eadatasize 0\n");
+                        RETURN(-EPROTO);
+                }
                 if (md->body->valid & OBD_MD_MEA) {
-                        LASSERT(exp_lmv != NULL);
-                
-                        rc = obd_unpackmd(exp_lmv, (void *)&md->mea,
-                                          lmm, md->body->eadatasize);
-                        if (rc > 0) {
-                                LASSERT(rc >= sizeof(*md->mea));
-                                rc = 0;
+                        lmvsize = md->body->eadatasize;
+                        lmv = req_capsule_server_sized_get(pill, &RMF_MDT_MD,
+                                                           lmvsize);
+                        if (!lmv)
+                                GOTO(out, rc = -EPROTO);
+
+                        rc = obd_unpackmd(md_exp, (void *)&md->mea, lmv,
+                                          lmvsize);
+                        if (rc < 0)
+                                GOTO(out, rc);
+
+                        if (rc < sizeof(*md->mea)) {
+                                CDEBUG(D_INFO, "size too small:  "
+                                       "rc < sizeof(*md->mea) (%d < %d)\n",
+                                        rc, (int)sizeof(*md->mea));
+                                GOTO(out, rc = -EPROTO);
                         }
                 }
-        } else {
-                LASSERT(S_ISCHR(md->body->mode) ||
-                        S_ISBLK(md->body->mode) ||
-                        S_ISFIFO(md->body->mode)||
-                        S_ISLNK(md->body->mode) ||
-                        S_ISSOCK(md->body->mode));
         }
+        rc = 0;
+
+        if (md->body->valid & OBD_MD_FLRMTPERM) {
+                /* remote permission */
+                LASSERT(client_is_remote(exp));
+                md->remote_perm = req_capsule_server_swab_get(pill, &RMF_ACL,
+                                                lustre_swab_mdt_remote_perm);
+                if (!md->remote_perm)
+                        GOTO(out, rc = -EPROTO);
+        }
+        else if (md->body->valid & OBD_MD_FLACL) {
+                /* for ACL, it's possible that FLACL is set but aclsize is zero.
+                 * only when aclsize != 0 there's an actual segment for ACL
+                 * in reply buffer.
+                 */
+                if (md->body->aclsize) {
+                        rc = mdc_unpack_acl(req, md);
+                        if (rc)
+                                GOTO(out, rc);
+#ifdef CONFIG_FS_POSIX_ACL
+                } else {
+                        md->posix_acl = NULL;
+#endif
+                }
+        }
+        if (md->body->valid & OBD_MD_FLMDSCAPA) {
+                struct obd_capa *oc = NULL;
 
-        /* if anything wrong when unpacking md, we don't check acl
-         * stuff, for simplicity
-         */
-        if (rc)
-                RETURN(rc);
+                rc = mdc_unpack_capa(NULL, req, &RMF_CAPA1, &oc);
+                if (rc)
+                        GOTO(out, rc);
+                md->mds_capa = oc;
+        }
 
-        reply_off = (md->body->valid & OBD_MD_FLEASIZE) ?
-                                (offset + 2) : (offset + 1);
-        rc = mdc_unpack_acl(exp_lmv, req, reply_off, md);
-        if (rc) {
-                CERROR("upack acl error %d \n", rc);
-                RETURN(rc);
+        if (md->body->valid & OBD_MD_FLOSSCAPA) {
+                struct obd_capa *oc = NULL;
+
+                rc = mdc_unpack_capa(NULL, req, &RMF_CAPA2, &oc);
+                if (rc)
+                        GOTO(out, rc);
+                md->oss_capa = oc;
         }
-        reply_off += 2;
-        
-        rc = mdc_unpack_gskey(exp_lmv, req, &reply_off, md);
-        if (rc)
-                RETURN(rc);
 
-        RETURN(rc);
+        EXIT;
+out:
+        if (rc) {
+                if (md->oss_capa) {
+                        capa_put(md->oss_capa);
+                        md->oss_capa = NULL;
+                }
+                if (md->mds_capa) {
+                        capa_put(md->mds_capa);
+                        md->mds_capa = NULL;
+                }
+#ifdef CONFIG_FS_POSIX_ACL
+                posix_acl_release(md->posix_acl);
+#endif
+                if (md->lsm)
+                        obd_free_memmd(dt_exp, &md->lsm);
+        }
+        return rc;
 }
 
-static void mdc_commit_open(struct ptlrpc_request *req)
+int mdc_free_lustre_md(struct obd_export *exp, struct lustre_md *md)
 {
-        struct mdc_open_data *mod = req->rq_cb_data;
-        if (mod == NULL)
-                return;
-
-        if (mod->mod_close_req != NULL)
-                mod->mod_close_req->rq_cb_data = NULL;
-
-        if (mod->mod_och != NULL)
-                mod->mod_och->och_mod = NULL;
-
-        OBD_FREE(mod, sizeof(*mod));
-        req->rq_cb_data = NULL;
-        LASSERT(atomic_read(&req->rq_refcount) > 1);
-        ptlrpc_req_finished(req);
+        ENTRY;
+        RETURN(0);
 }
 
-static void mdc_replay_open(struct ptlrpc_request *req)
+/**
+ * Handles both OPEN and SETATTR RPCs for OPEN-CLOSE and SETATTR-DONE_WRITING
+ * RPC chains.
+ */
+void mdc_replay_open(struct ptlrpc_request *req)
 {
-        struct mdc_open_data *mod = req->rq_cb_data;
-        struct obd_client_handle *och;
+        struct md_open_data *mod = req->rq_cb_data;
         struct ptlrpc_request *close_req;
+        struct obd_client_handle *och;
         struct lustre_handle old;
-        struct mds_body *body;
+        struct mdt_body *body;
         ENTRY;
 
-        body = lustre_swab_repbuf(req, 1, sizeof(*body), lustre_swab_mds_body);
-        LASSERT (body != NULL);
-
         if (mod == NULL) {
                 DEBUG_REQ(D_ERROR, req,
-                          "can't properly replay without open data");
+                          "Can't properly replay without open data.");
                 EXIT;
                 return;
         }
 
+        body = req_capsule_server_get(&req->rq_pill, &RMF_MDT_BODY);
+        LASSERT(body != NULL);
+
         och = mod->mod_och;
         if (och != NULL) {
                 struct lustre_handle *file_fh;
+
                 LASSERT(och->och_magic == OBD_CLIENT_HANDLE_MAGIC);
+
                 file_fh = &och->och_fh;
                 CDEBUG(D_HA, "updating handle from "LPX64" to "LPX64"\n",
                        file_fh->cookie, body->handle.cookie);
-                memcpy(&old, file_fh, sizeof(old));
-                memcpy(file_fh, &body->handle, sizeof(*file_fh));
+                old = *file_fh;
+                *file_fh = body->handle;
         }
-
         close_req = mod->mod_close_req;
         if (close_req != NULL) {
-                struct mds_body *close_body;
-                LASSERT(close_req->rq_reqmsg->opc == MDS_CLOSE);
-                close_body = lustre_msg_buf(close_req->rq_reqmsg,
-                                            MDS_REQ_REC_OFF,
-                                            sizeof(*close_body));
+                __u32 opc = lustre_msg_get_opc(close_req->rq_reqmsg);
+                struct mdt_ioepoch *epoch;
+
+                LASSERT(opc == MDS_CLOSE || opc == MDS_DONE_WRITING);
+                epoch = req_capsule_client_get(&close_req->rq_pill,
+                                               &RMF_MDT_EPOCH);
+                LASSERT(epoch);
+
                 if (och != NULL)
-                        LASSERT(!memcmp(&old, &close_body->handle, sizeof old));
+                        LASSERT(!memcmp(&old, &epoch->handle, sizeof(old)));
                 DEBUG_REQ(D_HA, close_req, "updating close body with new fh");
-                memcpy(&close_body->handle, &body->handle,
-                       sizeof(close_body->handle));
+                epoch->handle = body->handle;
         }
-
         EXIT;
 }
 
+void mdc_commit_open(struct ptlrpc_request *req)
+{
+        struct md_open_data *mod = req->rq_cb_data;
+        if (mod == NULL)
+                return;
+
+        /**
+         * No need to touch md_open_data::mod_och, it holds a reference on
+         * \var mod and will zero references to each other, \var mod will be
+         * freed after that when md_open_data::mod_och will put the reference.
+         */
+
+        /**
+         * Do not let open request to disappear as it still may be needed
+         * for close rpc to happen (it may happen on evict only, otherwise
+         * ptlrpc_request::rq_replay does not let mdc_commit_open() to be
+         * called), just mark this rpc as committed to distinguish these 2
+         * cases, see mdc_close() for details. The open request reference will
+         * be put along with freeing \var mod.
+         */
+        ptlrpc_request_addref(req);
+        cfs_spin_lock(&req->rq_lock);
+        req->rq_committed = 1;
+        cfs_spin_unlock(&req->rq_lock);
+        req->rq_cb_data = NULL;
+        obd_mod_put(mod);
+}
+
 int mdc_set_open_replay_data(struct obd_export *exp,
                              struct obd_client_handle *och,
                              struct ptlrpc_request *open_req)
 {
-        struct mdc_open_data *mod;
-        struct mds_rec_create *rec;
-        struct mds_body *body;
+        struct md_open_data   *mod;
+        struct mdt_rec_create *rec;
+        struct mdt_body       *body;
+        struct obd_import     *imp = open_req->rq_import;
+        ENTRY;
 
-        rec = lustre_msg_buf(open_req->rq_reqmsg, MDS_REQ_INTENT_REC_OFF,
-                             sizeof(*rec));
-        body = lustre_msg_buf(open_req->rq_repmsg, 1, sizeof(*body));
+        if (!open_req->rq_replay)
+                RETURN(0);
 
+        rec = req_capsule_client_get(&open_req->rq_pill, &RMF_REC_REINT);
+        body = req_capsule_server_get(&open_req->rq_pill, &RMF_MDT_BODY);
         LASSERT(rec != NULL);
-        /* outgoing messages always in my byte order */
+        /* Incoming message in my byte order (it's been swabbed). */
+        /* Outgoing messages always in my byte order. */
         LASSERT(body != NULL);
-        /* incoming message in my byte order (it's been swabbed) */
-        LASSERT_REPSWABBED(open_req, 1);
 
-        OBD_ALLOC(mod, sizeof(*mod));
-        if (mod == NULL) {
-                DEBUG_REQ(D_ERROR, open_req, "can't allocate mdc_open_data");
-                return 0;
-        }
+        /* Only if the import is replayable, we set replay_open data */
+        if (och && imp->imp_replayable) {
+                mod = obd_mod_alloc();
+                if (mod == NULL) {
+                        DEBUG_REQ(D_ERROR, open_req,
+                                  "Can't allocate md_open_data");
+                        RETURN(0);
+                }
 
-        och->och_mod = mod;
-        mod->mod_och = och;
-        mod->mod_open_req = ptlrpc_request_addref(open_req);
+                /**
+                 * Take a reference on \var mod, to be freed on mdc_close().
+                 * It protects \var mod from being freed on eviction (commit
+                 * callback is called despite rq_replay flag).
+                 * Another reference for \var och.
+                 */
+                obd_mod_get(mod);
+                obd_mod_get(mod);
+
+                cfs_spin_lock(&open_req->rq_lock);
+                och->och_mod = mod;
+                mod->mod_och = och;
+                mod->mod_open_req = open_req;
+                open_req->rq_cb_data = mod;
+                open_req->rq_commit_cb = mdc_commit_open;
+                cfs_spin_unlock(&open_req->rq_lock);
+        }
 
-        if (memcmp(&rec->cr_replayid, &body->id1, sizeof(rec->cr_replayid)))
-                CDEBUG(D_ERROR, DLID4" != "DLID4"\n", OLID4(&rec->cr_replayid),
-                       OLID4(&body->id1));
-        LASSERT(id_ino(&rec->cr_replayid) != 0);
-        memcpy(&rec->cr_replayid, &body->id1, sizeof rec->cr_replayid);
-        memcpy(&rec->cr_ioepoch, &body->io_epoch, sizeof rec->cr_ioepoch);
+        rec->cr_fid2 = body->fid1;
+        rec->cr_ioepoch = body->ioepoch;
+        rec->cr_old_handle.cookie = body->handle.cookie;
         open_req->rq_replay_cb = mdc_replay_open;
-        open_req->rq_commit_cb = mdc_commit_open;
-        open_req->rq_cb_data = mod;
-        DEBUG_REQ(D_HA, open_req, "set up replay data");
-        return 0;
+        if (!fid_is_sane(&body->fid1)) {
+                DEBUG_REQ(D_ERROR, open_req, "Saving replay request with "
+                          "insane fid");
+                LBUG();
+        }
+
+        DEBUG_REQ(D_RPCTRACE, open_req, "Set up open replay data");
+        RETURN(0);
 }
 
 int mdc_clear_open_replay_data(struct obd_export *exp,
                                struct obd_client_handle *och)
 {
-        struct mdc_open_data *mod = och->och_mod;
-
-        /* Don't free the structure now (it happens in mdc_commit_open, after
-         * we're sure we won't need to fix up the close request in the future),
-         * but make sure that replay doesn't poke at the och, which is about to
-         * be freed. */
-        LASSERT(mod != LP_POISON);
-        if (mod != NULL)
-                mod->mod_och = NULL;
+        struct md_open_data *mod = och->och_mod;
+        ENTRY;
+
+        LASSERT(mod != LP_POISON && mod != NULL);
+
+        mod->mod_och = NULL;
         och->och_mod = NULL;
-        return 0;
+        obd_mod_put(mod);
+
+        RETURN(0);
 }
 
-static void mdc_commit_close(struct ptlrpc_request *req)
-{
-        struct mdc_open_data *mod = req->rq_cb_data;
-        struct obd_import *imp = req->rq_import;
-        struct ptlrpc_request *open_req;
+/* Prepares the request for the replay by the given reply */
+static void mdc_close_handle_reply(struct ptlrpc_request *req,
+                                   struct md_op_data *op_data, int rc) {
+        struct mdt_body  *repbody;
+        struct mdt_ioepoch *epoch;
 
-        DEBUG_REQ(D_HA, req, "close req committed");
-        if (mod == NULL)
-                return;
+        if (req && rc == -EAGAIN) {
+                repbody = req_capsule_server_get(&req->rq_pill, &RMF_MDT_BODY);
+                epoch = req_capsule_client_get(&req->rq_pill, &RMF_MDT_EPOCH);
 
-        mod->mod_close_req = NULL;
-        req->rq_cb_data = NULL;
-        req->rq_commit_cb = NULL;
-
-        open_req = mod->mod_open_req;
-        LASSERT(open_req != NULL);
-        LASSERT(open_req != LP_POISON);
-        LASSERT(open_req->rq_type != LI_POISON);
-
-        DEBUG_REQ(D_HA, open_req, "open req balanced");
-        if (open_req->rq_transno == 0) {
-                DEBUG_REQ(D_ERROR, open_req, "BUG 3892  open");
-                DEBUG_REQ(D_ERROR, req, "BUG 3892 close");
-                LASSERTF(open_req->rq_transno != 0, "BUG 3892\n");
-        }
-        LASSERT(open_req->rq_import == imp);
-
-        /* We no longer want to preserve this for transno-unconditional
-         * replay. */
-        spin_lock(&open_req->rq_lock);
-        open_req->rq_replay = 0;
-        spin_unlock(&open_req->rq_lock);
+                epoch->flags |= MF_SOM_AU;
+                if (repbody->valid & OBD_MD_FLGETATTRLOCK)
+                        op_data->op_flags |= MF_GETATTR_LOCK;
+        }
 }
 
-int mdc_close(struct obd_export *exp, struct mdc_op_data *op_data,
-              struct obd_client_handle *och, struct ptlrpc_request **request)
+int mdc_close(struct obd_export *exp, struct md_op_data *op_data,
+              struct md_open_data *mod, struct ptlrpc_request **request)
 {
-        struct obd_device *obd = class_exp2obd(exp);
-        struct obd_import *imp = class_exp2cliimp(exp);
-        int reqsize[3] = {0, sizeof(struct mds_body),
-                          obd->u.cli.cl_max_mds_cookiesize};
-        int rc, repsize[3] = {sizeof(struct mds_body),
-                              obd->u.cli.cl_max_mds_easize,
-                              obd->u.cli.cl_max_mds_cookiesize};
+        struct obd_device     *obd = class_exp2obd(exp);
         struct ptlrpc_request *req;
-        struct mdc_open_data *mod;
+        int                    rc;
         ENTRY;
 
-        if (imp->imp_connection == NULL) {
-                CERROR("request on not connected import %s\n",
-                        imp->imp_obd->obd_name);
-                RETURN(-EIO);
+        *request = NULL;
+        req = ptlrpc_request_alloc(class_exp2cliimp(exp), &RQF_MDS_CLOSE);
+        if (req == NULL)
+                RETURN(-ENOMEM);
+
+        mdc_set_capa_size(req, &RMF_CAPA1, op_data->op_capa1);
+
+        rc = ptlrpc_request_pack(req, LUSTRE_MDS_VERSION, MDS_CLOSE);
+        if (rc) {
+                ptlrpc_request_free(req);
+                RETURN(rc);
         }
 
-        req = ptlrpc_prep_req(class_exp2cliimp(exp), LUSTRE_MDS_VERSION,
-                              MDS_CLOSE, 3, reqsize, NULL);
-        if (req == NULL)
-                GOTO(out, rc = -ENOMEM);
-        //req->rq_request_portal = MDS_CLOSE_PORTAL;
+        /* To avoid a livelock (bug 7034), we need to send CLOSE RPCs to a
+         * portal whose threads are not taking any DLM locks and are therefore
+         * always progressing */
+        req->rq_request_portal = MDS_READPAGE_PORTAL;
+        ptlrpc_at_set_req_timeout(req);
 
-        /* ensure that this close's handle is fixed up during replay. */
-        LASSERT(och != NULL);
-        mod = och->och_mod;
+        /* Ensure that this close's handle is fixed up during replay. */
         if (likely(mod != NULL)) {
+                LASSERTF(mod->mod_open_req != NULL &&
+                         mod->mod_open_req->rq_type != LI_POISON,
+                         "POISONED open %p!\n", mod->mod_open_req);
+
                 mod->mod_close_req = req;
-                LASSERT(mod->mod_open_req->rq_type != LI_POISON);
+
                 DEBUG_REQ(D_HA, mod->mod_open_req, "matched open");
+                /* We no longer want to preserve this open for replay even
+                 * though the open was committed. b=3632, b=3633 */
+                cfs_spin_lock(&mod->mod_open_req->rq_lock);
+                mod->mod_open_req->rq_replay = 0;
+                cfs_spin_unlock(&mod->mod_open_req->rq_lock);
         } else {
-                CDEBUG(D_HA, "couldn't find open req; "
-                       "expecting close error\n");
+                 CDEBUG(D_HA, "couldn't find open req; expecting close error\n");
         }
 
-        mdc_close_pack(req, 1, op_data, och);
+        mdc_close_pack(req, op_data);
 
-        req->rq_replen = lustre_msg_size(3, repsize);
-        req->rq_commit_cb = mdc_commit_close;
-        LASSERT(req->rq_cb_data == NULL);
-        req->rq_cb_data = mod;
+        req_capsule_set_size(&req->rq_pill, &RMF_MDT_MD, RCL_SERVER,
+                             obd->u.cli.cl_max_mds_easize);
+        req_capsule_set_size(&req->rq_pill, &RMF_LOGCOOKIES, RCL_SERVER,
+                             obd->u.cli.cl_max_mds_cookiesize);
+
+        ptlrpc_request_set_replen(req);
 
         mdc_get_rpc_lock(obd->u.cli.cl_close_lock, NULL);
         rc = ptlrpc_queue_wait(req);
         mdc_put_rpc_lock(obd->u.cli.cl_close_lock, NULL);
 
         if (req->rq_repmsg == NULL) {
-                CDEBUG(D_HA, "request failed to send: %p, %d\n", req,
+                CDEBUG(D_RPCTRACE, "request failed to send: %p, %d\n", req,
                        req->rq_status);
                 if (rc == 0)
-                        rc = req->rq_status ? req->rq_status : -EIO;
-        } else if (rc == 0) {
-                rc = req->rq_repmsg->status;
-                if (req->rq_repmsg->type == PTL_RPC_MSG_ERR) {
-                        DEBUG_REQ(D_ERROR, req, "type == PTL_RPC_MSG_ERR, "
-                                  "err = %d", rc);
+                        rc = req->rq_status ?: -EIO;
+        } else if (rc == 0 || rc == -EAGAIN) {
+                struct mdt_body *body;
+
+                rc = lustre_msg_get_status(req->rq_repmsg);
+                if (lustre_msg_get_type(req->rq_repmsg) == PTL_RPC_MSG_ERR) {
+                        DEBUG_REQ(D_ERROR, req, "type == PTL_RPC_MSG_ERR, err "
+                                  "= %d", rc);
                         if (rc > 0)
                                 rc = -rc;
-                } else {
-                        if (mod == NULL)
-                                CERROR("Unexpected: can't find mdc_open_data, but "
-                                       "close succeeded. Please tell CFS.\n");
-                        if (!lustre_swab_repbuf(req, 0, sizeof(struct mds_body),
-                                                lustre_swab_mds_body))
-                        {
-                                CERROR("Error unpacking mds_body\n");
-                                rc = -EPROTO;
-                        }
+                }
+                body = req_capsule_server_get(&req->rq_pill, &RMF_MDT_BODY);
+                if (body == NULL)
+                        rc = -EPROTO;
+        } else if (rc == -ESTALE) {
+                /**
+                 * it can be allowed error after 3633 if open was committed and
+                 * server failed before close was sent. Let's check if mod
+                 * exists and return no error in that case
+                 */
+                if (mod) {
+                        LASSERT(mod->mod_open_req != NULL);
+                        if (mod->mod_open_req->rq_committed)
+                                rc = 0;
                 }
         }
 
-        EXIT;
- out:
+        if (mod) {
+                if (rc != 0)
+                        mod->mod_close_req = NULL;
+                /* Since now, mod is accessed through open_req only,
+                 * thus close req does not keep a reference on mod anymore. */
+                obd_mod_put(mod);
+        }
         *request = req;
-        return rc;
+        mdc_close_handle_reply(req, op_data, rc);
+        RETURN(rc);
 }
 
-int mdc_done_writing(struct obd_export *exp, struct obdo *obdo)
+int mdc_done_writing(struct obd_export *exp, struct md_op_data *op_data,
+                     struct md_open_data *mod)
 {
+        struct obd_device     *obd = class_exp2obd(exp);
         struct ptlrpc_request *req;
-        struct mds_body *body;
-        int rc, size[2] = {0, sizeof(*body)};
+        int                    rc;
         ENTRY;
 
-        size[0] = lustre_secdesc_size();
-
-        req = ptlrpc_prep_req(class_exp2cliimp(exp), LUSTRE_MDS_VERSION,
-                              MDS_DONE_WRITING, 2, size, NULL);
+        req = ptlrpc_request_alloc(class_exp2cliimp(exp),
+                                   &RQF_MDS_DONE_WRITING);
         if (req == NULL)
                 RETURN(-ENOMEM);
 
-        lustre_pack_secdesc(req, size[0]);
+        mdc_set_capa_size(req, &RMF_CAPA1, op_data->op_capa1);
+        rc = ptlrpc_request_pack(req, LUSTRE_MDS_VERSION, MDS_DONE_WRITING);
+        if (rc) {
+                ptlrpc_request_free(req);
+                RETURN(rc);
+        }
 
-        body = lustre_msg_buf(req->rq_reqmsg, MDS_REQ_REC_OFF, 
-                              sizeof(*body));
-        
-        mdc_pack_id(&body->id1, obdo->o_id, 0, obdo->o_mode, 
-                    obdo->o_mds, obdo->o_fid);
-        
-        body->size = obdo->o_size;
-        body->blocks = obdo->o_blocks;
-        body->flags = obdo->o_flags;
-        body->valid = obdo->o_valid;
+        if (mod != NULL) {
+                LASSERTF(mod->mod_open_req != NULL &&
+                         mod->mod_open_req->rq_type != LI_POISON,
+                         "POISONED setattr %p!\n", mod->mod_open_req);
 
-        req->rq_replen = lustre_msg_size(1, &size[1]);
+                mod->mod_close_req = req;
+                DEBUG_REQ(D_HA, mod->mod_open_req, "matched setattr");
+                /* We no longer want to preserve this setattr for replay even
+                 * though the open was committed. b=3632, b=3633 */
+                cfs_spin_lock(&mod->mod_open_req->rq_lock);
+                mod->mod_open_req->rq_replay = 0;
+                cfs_spin_unlock(&mod->mod_open_req->rq_lock);
+        }
 
+        mdc_close_pack(req, op_data);
+        ptlrpc_request_set_replen(req);
+
+        mdc_get_rpc_lock(obd->u.cli.cl_close_lock, NULL);
         rc = ptlrpc_queue_wait(req);
+        mdc_put_rpc_lock(obd->u.cli.cl_close_lock, NULL);
+
+        if (rc == -ESTALE) {
+                /**
+                 * it can be allowed error after 3633 if open or setattr were
+                 * committed and server failed before close was sent.
+                 * Let's check if mod exists and return no error in that case
+                 */
+                if (mod) {
+                        LASSERT(mod->mod_open_req != NULL);
+                        if (mod->mod_open_req->rq_committed)
+                                rc = 0;
+                }
+        }
+
+        if (mod) {
+                if (rc != 0)
+                        mod->mod_close_req = NULL;
+                /* Since now, mod is accessed through setattr req only,
+                 * thus DW req does not keep a reference on mod anymore. */
+                obd_mod_put(mod);
+        }
+
+        mdc_close_handle_reply(req, op_data, rc);
         ptlrpc_req_finished(req);
         RETURN(rc);
 }
 
-int mdc_readpage(struct obd_export *exp,
-                 struct lustre_id *id,
-                 __u64 offset, struct page *page,
-                 struct ptlrpc_request **request)
+#ifdef HAVE_SPLIT_SUPPORT
+int mdc_sendpage(struct obd_export *exp, const struct lu_fid *fid,
+                 const struct page *page, int offset)
 {
-        struct obd_import *imp = class_exp2cliimp(exp);
-        struct ptlrpc_request *req = NULL;
-        struct ptlrpc_bulk_desc *desc = NULL;
-        struct mds_body *body;
-        int rc, size[2] = {0, sizeof(*body)};
+        struct ptlrpc_request   *req;
+        struct ptlrpc_bulk_desc *desc;
+        int                      rc;
         ENTRY;
 
-        CDEBUG(D_INODE, "inode: %ld\n", (long)id->li_stc.u.e3s.l3s_ino);
+        req = ptlrpc_request_alloc(class_exp2cliimp(exp), &RQF_MDS_WRITEPAGE);
+        if (req == NULL)
+                RETURN(-ENOMEM);
 
-        size[0] = lustre_secdesc_size();
+        /* FIXME: capa doesn't support split yet */
+        mdc_set_capa_size(req, &RMF_CAPA1, NULL);
 
-        req = ptlrpc_prep_req(imp, LUSTRE_MDS_VERSION, MDS_READPAGE,
-                              2, size, NULL);
-        if (req == NULL)
-                GOTO(out, rc = -ENOMEM);
-        /* XXX FIXME bug 249 */
-        req->rq_request_portal = MDS_READPAGE_PORTAL;
+        rc = ptlrpc_request_pack(req, LUSTRE_MDS_VERSION, MDS_WRITEPAGE);
+        if (rc) {
+                ptlrpc_request_free(req);
+                RETURN(rc);
+        }
 
-        lustre_pack_secdesc(req, size[0]);
+        req->rq_request_portal = MDS_READPAGE_PORTAL;
+        ptlrpc_at_set_req_timeout(req);
 
-        desc = ptlrpc_prep_bulk_imp(req, 1, BULK_PUT_SINK, MDS_BULK_PORTAL);
+        desc = ptlrpc_prep_bulk_imp(req, 1, BULK_GET_SOURCE, MDS_BULK_PORTAL);
         if (desc == NULL)
                 GOTO(out, rc = -ENOMEM);
-        /* NB req now owns desc and will free it when it gets freed */
 
-        ptlrpc_prep_bulk_page(desc, page, 0, PAGE_CACHE_SIZE);
-        mdc_readdir_pack(req, 1, offset, PAGE_CACHE_SIZE, id);
+        /* NB req now owns desc and will free it when it gets freed. */
+        ptlrpc_prep_bulk_page(desc, (struct page *)page, 0, offset);
+        mdc_readdir_pack(req, 0, offset, fid, NULL);
 
-        req->rq_replen = lustre_msg_size(1, &size[1]);
+        ptlrpc_request_set_replen(req);
         rc = ptlrpc_queue_wait(req);
+        if (rc)
+                GOTO(out, rc);
 
-        if (rc == 0) {
-                body = lustre_swab_repbuf(req, 0, sizeof (*body),
-                                          lustre_swab_mds_body);
-                if (body == NULL) {
-                        CERROR("Can't unpack mds_body\n");
-                        GOTO(out, rc = -EPROTO);
-                }
+        rc = sptlrpc_cli_unwrap_bulk_write(req, req->rq_bulk);
+out:
+        ptlrpc_req_finished(req);
+        return rc;
+}
+EXPORT_SYMBOL(mdc_sendpage);
+#endif
 
-                if (req->rq_bulk->bd_nob_transferred != PAGE_CACHE_SIZE) {
-                        CERROR ("Unexpected # bytes transferred: %d"
-                                " (%ld expected)\n",
-                                req->rq_bulk->bd_nob_transferred,
-                                PAGE_CACHE_SIZE);
-                        GOTO (out, rc = -EPROTO);
-                }
+int mdc_readpage(struct obd_export *exp, const struct lu_fid *fid,
+                 struct obd_capa *oc, __u64 offset, struct page *page,
+                 struct ptlrpc_request **request)
+{
+        struct ptlrpc_request   *req;
+        struct ptlrpc_bulk_desc *desc;
+        int                      rc;
+        ENTRY;
+
+        *request = NULL;
+        req = ptlrpc_request_alloc(class_exp2cliimp(exp), &RQF_MDS_READPAGE);
+        if (req == NULL)
+                RETURN(-ENOMEM);
+
+        mdc_set_capa_size(req, &RMF_CAPA1, oc);
+
+        rc = ptlrpc_request_pack(req, LUSTRE_MDS_VERSION, MDS_READPAGE);
+        if (rc) {
+                ptlrpc_request_free(req);
+                RETURN(rc);
+        }
+
+        req->rq_request_portal = MDS_READPAGE_PORTAL;
+        ptlrpc_at_set_req_timeout(req);
+
+        desc = ptlrpc_prep_bulk_imp(req, 1, BULK_PUT_SINK, MDS_BULK_PORTAL);
+        if (desc == NULL) {
+                ptlrpc_request_free(req);
+                RETURN(-ENOMEM);
+        }
+
+        /* NB req now owns desc and will free it when it gets freed */
+        ptlrpc_prep_bulk_page(desc, page, 0, CFS_PAGE_SIZE);
+        mdc_readdir_pack(req, offset, CFS_PAGE_SIZE, fid, oc);
+
+        ptlrpc_request_set_replen(req);
+        rc = ptlrpc_queue_wait(req);
+        if (rc) {
+                ptlrpc_req_finished(req);
+                RETURN(rc);
+        }
+
+        rc = sptlrpc_cli_unwrap_bulk_read(req, req->rq_bulk,
+                                          req->rq_bulk->bd_nob_transferred);
+        if (rc < 0) {
+                ptlrpc_req_finished(req);
+                RETURN(rc);
+        }
+
+        if (req->rq_bulk->bd_nob_transferred != CFS_PAGE_SIZE) {
+                CERROR("Unexpected # bytes transferred: %d (%ld expected)\n",
+                        req->rq_bulk->bd_nob_transferred, CFS_PAGE_SIZE);
+                ptlrpc_req_finished(req);
+                RETURN(-EPROTO);
         }
 
-        EXIT;
- out:
         *request = req;
+        RETURN(0);
+}
+
+static int mdc_statfs(struct obd_device *obd, struct obd_statfs *osfs,
+                      __u64 max_age, __u32 flags)
+{
+        struct ptlrpc_request *req;
+        struct obd_statfs     *msfs;
+        struct obd_import     *imp = NULL;
+        int                    rc;
+        ENTRY;
+
+        /*
+         * Since the request might also come from lprocfs, so we need
+         * sync this with client_disconnect_export Bug15684
+         */
+        cfs_down_read(&obd->u.cli.cl_sem);
+        if (obd->u.cli.cl_import)
+                imp = class_import_get(obd->u.cli.cl_import);
+        cfs_up_read(&obd->u.cli.cl_sem);
+        if (!imp)
+                RETURN(-ENODEV);
+
+        req = ptlrpc_request_alloc_pack(imp, &RQF_MDS_STATFS,
+                                        LUSTRE_MDS_VERSION, MDS_STATFS);
+        if (req == NULL)
+                GOTO(output, rc = -ENOMEM);
+
+        ptlrpc_request_set_replen(req);
+
+        if (flags & OBD_STATFS_NODELAY) {
+                /* procfs requests not want stay in wait for avoid deadlock */
+                req->rq_no_resend = 1;
+                req->rq_no_delay = 1;
+        }
+
+        rc = ptlrpc_queue_wait(req);
+        if (rc) {
+                /* check connection error first */
+                if (imp->imp_connect_error)
+                        rc = imp->imp_connect_error;
+                GOTO(out, rc);
+        }
+
+        msfs = req_capsule_server_get(&req->rq_pill, &RMF_OBD_STATFS);
+        if (msfs == NULL)
+                GOTO(out, rc = -EPROTO);
+
+        *osfs = *msfs;
+        EXIT;
+out:
+        ptlrpc_req_finished(req);
+output:
+        class_import_put(imp);
         return rc;
 }
 
+static int mdc_ioc_fid2path(struct obd_export *exp, struct getinfo_fid2path *gf)
+{
+        __u32 keylen, vallen;
+        void *key;
+        int rc;
+
+        if (gf->gf_pathlen > PATH_MAX)
+                RETURN(-ENAMETOOLONG);
+        if (gf->gf_pathlen < 2)
+                RETURN(-EOVERFLOW);
+
+        /* Key is KEY_FID2PATH + getinfo_fid2path description */
+        keylen = cfs_size_round(sizeof(KEY_FID2PATH)) + sizeof(*gf);
+        OBD_ALLOC(key, keylen);
+        if (key == NULL)
+                RETURN(-ENOMEM);
+        memcpy(key, KEY_FID2PATH, sizeof(KEY_FID2PATH));
+        memcpy(key + cfs_size_round(sizeof(KEY_FID2PATH)), gf, sizeof(*gf));
+
+        CDEBUG(D_IOCTL, "path get "DFID" from "LPU64" #%d\n",
+               PFID(&gf->gf_fid), gf->gf_recno, gf->gf_linkno);
+
+        if (!fid_is_sane(&gf->gf_fid))
+                GOTO(out, rc = -EINVAL);
+
+        /* Val is struct getinfo_fid2path result plus path */
+        vallen = sizeof(*gf) + gf->gf_pathlen;
+
+        rc = obd_get_info(exp, keylen, key, &vallen, gf, NULL);
+        if (rc)
+                GOTO(out, rc);
+
+        if (vallen <= sizeof(*gf))
+                GOTO(out, rc = -EPROTO);
+        else if (vallen > sizeof(*gf) + gf->gf_pathlen)
+                GOTO(out, rc = -EOVERFLOW);
+
+        CDEBUG(D_IOCTL, "path get "DFID" from "LPU64" #%d\n%s\n",
+               PFID(&gf->gf_fid), gf->gf_recno, gf->gf_linkno, gf->gf_path);
+
+out:
+        OBD_FREE(key, keylen);
+        return rc;
+}
+
+static struct kuc_hdr *changelog_kuc_hdr(char *buf, int len, int flags)
+{
+        struct kuc_hdr *lh = (struct kuc_hdr *)buf;
+
+        LASSERT(len <= CR_MAXSIZE);
+
+        lh->kuc_magic = KUC_MAGIC;
+        lh->kuc_transport = KUC_TRANSPORT_CHANGELOG;
+        lh->kuc_flags = flags;
+        lh->kuc_msgtype = CL_RECORD;
+        lh->kuc_msglen = len;
+        return lh;
+}
+
+#define D_CHANGELOG 0
+
+struct changelog_show {
+        __u64       cs_startrec;
+        __u32       cs_flags;
+        cfs_file_t *cs_fp;
+        char       *cs_buf;
+        struct obd_device *cs_obd;
+};
+
+static int changelog_show_cb(struct llog_handle *llh, struct llog_rec_hdr *hdr,
+                             void *data)
+{
+        struct changelog_show *cs = data;
+        struct llog_changelog_rec *rec = (struct llog_changelog_rec *)hdr;
+        struct kuc_hdr *lh;
+        int len, rc;
+        ENTRY;
+
+        if ((rec->cr_hdr.lrh_type != CHANGELOG_REC) ||
+            (rec->cr.cr_type >= CL_LAST)) {
+                CERROR("Not a changelog rec %d/%d\n", rec->cr_hdr.lrh_type,
+                       rec->cr.cr_type);
+                RETURN(-EINVAL);
+        }
+
+        if (rec->cr.cr_index < cs->cs_startrec) {
+                /* Skip entries earlier than what we are interested in */
+                CDEBUG(D_CHANGELOG, "rec="LPU64" start="LPU64"\n",
+                       rec->cr.cr_index, cs->cs_startrec);
+                RETURN(0);
+        }
+
+        CDEBUG(D_CHANGELOG, LPU64" %02d%-5s "LPU64" 0x%x t="DFID" p="DFID
+               " %.*s\n", rec->cr.cr_index, rec->cr.cr_type,
+               changelog_type2str(rec->cr.cr_type), rec->cr.cr_time,
+               rec->cr.cr_flags & CLF_FLAGMASK,
+               PFID(&rec->cr.cr_tfid), PFID(&rec->cr.cr_pfid),
+               rec->cr.cr_namelen, rec->cr.cr_name);
+
+        len = sizeof(*lh) + sizeof(rec->cr) + rec->cr.cr_namelen;
+
+        /* Set up the message */
+        lh = changelog_kuc_hdr(cs->cs_buf, len, cs->cs_flags);
+        memcpy(lh + 1, &rec->cr, len - sizeof(*lh));
+
+        rc = libcfs_kkuc_msg_put(cs->cs_fp, lh);
+        CDEBUG(D_CHANGELOG, "kucmsg fp %p len %d rc %d\n", cs->cs_fp, len,rc);
+
+        RETURN(rc);
+}
+
+static int mdc_changelog_send_thread(void *csdata)
+{
+        struct changelog_show *cs = csdata;
+        struct llog_ctxt *ctxt = NULL;
+        struct llog_handle *llh = NULL;
+        struct kuc_hdr *kuch;
+        int rc;
+
+        CDEBUG(D_CHANGELOG, "changelog to fp=%p start "LPU64"\n",
+               cs->cs_fp, cs->cs_startrec);
+
+        OBD_ALLOC(cs->cs_buf, CR_MAXSIZE);
+        if (cs->cs_buf == NULL)
+                GOTO(out, rc = -ENOMEM);
+
+        /* Set up the remote catalog handle */
+        ctxt = llog_get_context(cs->cs_obd, LLOG_CHANGELOG_REPL_CTXT);
+        if (ctxt == NULL)
+                GOTO(out, rc = -ENOENT);
+        rc = llog_create(ctxt, &llh, NULL, CHANGELOG_CATALOG);
+        if (rc) {
+                CERROR("llog_create() failed %d\n", rc);
+                GOTO(out, rc);
+        }
+        rc = llog_init_handle(llh, LLOG_F_IS_CAT, NULL);
+        if (rc) {
+                CERROR("llog_init_handle failed %d\n", rc);
+                GOTO(out, rc);
+        }
+
+        /* We need the pipe fd open, so llog_process can't daemonize */
+        rc = llog_cat_process_flags(llh, changelog_show_cb, cs,
+                                    LLOG_FLAG_NODEAMON, 0, 0);
+
+        /* Send EOF no matter what our result */
+        if ((kuch = changelog_kuc_hdr(cs->cs_buf, sizeof(*kuch),
+                                      cs->cs_flags))) {
+                kuch->kuc_msgtype = CL_EOF;
+                libcfs_kkuc_msg_put(cs->cs_fp, kuch);
+        }
+
+out:
+        cfs_put_file(cs->cs_fp);
+        if (llh)
+                llog_cat_put(llh);
+        if (ctxt)
+                llog_ctxt_put(ctxt);
+        if (cs->cs_buf)
+                OBD_FREE(cs->cs_buf, CR_MAXSIZE);
+        OBD_FREE_PTR(cs);
+        return rc;
+}
+
+static int mdc_ioc_changelog_send(struct obd_device *obd,
+                                  struct ioc_changelog *icc)
+{
+        struct changelog_show *cs;
+        int rc;
+
+        /* Freed in mdc_changelog_send_thread */
+        OBD_ALLOC_PTR(cs);
+        if (!cs)
+                return -ENOMEM;
+
+        cs->cs_obd = obd;
+        cs->cs_startrec = icc->icc_recno;
+        /* matching cfs_put_file in mdc_changelog_send_thread */
+        cs->cs_fp = cfs_get_fd(icc->icc_id);
+        cs->cs_flags = icc->icc_flags;
+
+        /* New thread because we should return to user app before
+           writing into our pipe */
+        rc = cfs_kernel_thread(mdc_changelog_send_thread, cs,
+                               CLONE_VM | CLONE_FILES);
+        if (rc >= 0) {
+                CDEBUG(D_CHANGELOG, "start changelog thread: %d\n", rc);
+                return 0;
+        }
+
+        CERROR("Failed to start changelog thread: %d\n", rc);
+        OBD_FREE_PTR(cs);
+        return rc;
+}
+
+static int mdc_ioc_hsm_ct_start(struct obd_export *exp,
+                                struct lustre_kernelcomm *lk);
+
 static int mdc_iocontrol(unsigned int cmd, struct obd_export *exp, int len,
                          void *karg, void *uarg)
 {
@@ -919,15 +1328,30 @@ static int mdc_iocontrol(unsigned int cmd, struct obd_export *exp, int len,
         int rc;
         ENTRY;
 
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0))
-        MOD_INC_USE_COUNT;
-#else
-        if (!try_module_get(THIS_MODULE)) {
+        if (!cfs_try_module_get(THIS_MODULE)) {
                 CERROR("Can't get module. Is it alive?");
                 return -EINVAL;
         }
-#endif
         switch (cmd) {
+        case LL_IOC_HSM_CT_START:
+                rc = mdc_ioc_hsm_ct_start(exp, karg);
+                GOTO(out, rc);
+        case OBD_IOC_CHANGELOG_SEND:
+                rc = mdc_ioc_changelog_send(obd, karg);
+                GOTO(out, rc);
+        case OBD_IOC_CHANGELOG_CLEAR: {
+                struct ioc_changelog *icc = karg;
+                struct changelog_setinfo cs =
+                        {.cs_recno = icc->icc_recno, .cs_id = icc->icc_id};
+                rc = obd_set_info_async(exp, strlen(KEY_CHANGELOG_CLEAR),
+                                        KEY_CHANGELOG_CLEAR, sizeof(cs), &cs,
+                                        NULL);
+                GOTO(out, rc);
+        }
+        case OBD_IOC_FID2PATH: {
+                rc = mdc_ioc_fid2path(exp, karg);
+                GOTO(out, rc);
+        }
         case OBD_IOC_CLIENT_RECOVER:
                 rc = ptlrpc_recover_import(imp, data->ioc_inlbuf1);
                 if (rc < 0)
@@ -936,326 +1360,432 @@ static int mdc_iocontrol(unsigned int cmd, struct obd_export *exp, int len,
         case IOC_OSC_SET_ACTIVE:
                 rc = ptlrpc_set_import_active(imp, data->ioc_offset);
                 GOTO(out, rc);
-        case IOC_OSC_CTL_RECOVERY:
-                rc = ptlrpc_import_control_recovery(imp, data->ioc_offset);
-                GOTO(out, rc);
         case OBD_IOC_PARSE: {
-                ctxt = llog_get_context(&exp->exp_obd->obd_llogs,
-                                        LLOG_CONFIG_REPL_CTXT);
-                rc = class_config_process_llog(ctxt, data->ioc_inlbuf1, NULL);
+                ctxt = llog_get_context(exp->exp_obd, LLOG_CONFIG_REPL_CTXT);
+                rc = class_config_parse_llog(ctxt, data->ioc_inlbuf1, NULL);
+                llog_ctxt_put(ctxt);
                 GOTO(out, rc);
         }
 #ifdef __KERNEL__
         case OBD_IOC_LLOG_INFO:
         case OBD_IOC_LLOG_PRINT: {
-                ctxt = llog_get_context(&obd->obd_llogs, LLOG_CONFIG_REPL_CTXT);
+                ctxt = llog_get_context(obd, LLOG_CONFIG_REPL_CTXT);
                 rc = llog_ioctl(ctxt, cmd, data);
+                llog_ctxt_put(ctxt);
+                GOTO(out, rc);
+        }
+#endif
+        case OBD_IOC_POLL_QUOTACHECK:
+                rc = lquota_poll_check(quota_interface, exp,
+                                       (struct if_quotacheck *)karg);
+                GOTO(out, rc);
+        case OBD_IOC_PING_TARGET:
+                rc = ptlrpc_obd_ping(obd);
+                GOTO(out, rc);
+        /*
+         * Normally IOC_OBD_STATFS iocontrol is handled by LMV instead of MDC.
+         * But when the cluster is upgraded from 1.8, there'd be no LMV layer
+         * thus we might be called here. Eventually this code should be removed.
+         * bz20731.
+         */
+        case IOC_OBD_STATFS: {
+                struct obd_statfs stat_buf = {0};
+
+                if (*((__u32 *) data->ioc_inlbuf2) != 0)
+                        GOTO(out, rc = -ENODEV);
+
+                rc = mdc_statfs(obd, &stat_buf,
+                                cfs_time_current_64() - CFS_HZ, 0);
+                if (rc != 0)
+                        GOTO(out, rc);
+
+                if (cfs_copy_to_user(data->ioc_pbuf1, &stat_buf,
+                                     data->ioc_plen1))
+                        GOTO(out, rc = -EFAULT);
+                if (cfs_copy_to_user(data->ioc_pbuf2, obd2cli_tgt(obd),
+                                     data->ioc_plen2))
+                        GOTO(out, rc = -EFAULT);
+
+                GOTO(out, rc = 0);
+        }
+        default:
+                CERROR("mdc_ioctl(): unrecognised ioctl %#x\n", cmd);
+                GOTO(out, rc = -ENOTTY);
+        }
+out:
+        cfs_module_put(THIS_MODULE);
+
+        return rc;
+}
+
+int mdc_get_info_rpc(struct obd_export *exp,
+                     obd_count keylen, void *key,
+                     int vallen, void *val)
+{
+        struct obd_import      *imp = class_exp2cliimp(exp);
+        struct ptlrpc_request  *req;
+        char                   *tmp;
+        int                     rc = -EINVAL;
+        ENTRY;
+
+        req = ptlrpc_request_alloc(imp, &RQF_MDS_GET_INFO);
+        if (req == NULL)
+                RETURN(-ENOMEM);
+
+        req_capsule_set_size(&req->rq_pill, &RMF_GETINFO_KEY,
+                             RCL_CLIENT, keylen);
+        req_capsule_set_size(&req->rq_pill, &RMF_GETINFO_VALLEN,
+                             RCL_CLIENT, sizeof(__u32));
+
+        rc = ptlrpc_request_pack(req, LUSTRE_MDS_VERSION, MDS_GET_INFO);
+        if (rc) {
+                ptlrpc_request_free(req);
+                RETURN(rc);
+        }
+
+        tmp = req_capsule_client_get(&req->rq_pill, &RMF_GETINFO_KEY);
+        memcpy(tmp, key, keylen);
+        tmp = req_capsule_client_get(&req->rq_pill, &RMF_GETINFO_VALLEN);
+        memcpy(tmp, &vallen, sizeof(__u32));
+
+        req_capsule_set_size(&req->rq_pill, &RMF_GETINFO_VAL,
+                             RCL_SERVER, vallen);
+        ptlrpc_request_set_replen(req);
+
+        rc = ptlrpc_queue_wait(req);
+        if (rc == 0) {
+                tmp = req_capsule_server_get(&req->rq_pill, &RMF_GETINFO_VAL);
+                memcpy(val, tmp, vallen);
+                if (ptlrpc_rep_need_swab(req)) {
+                        if (KEY_IS(KEY_FID2PATH)) {
+                                lustre_swab_fid2path(val);
+                        }
+                }
+        }
+        ptlrpc_req_finished(req);
+
+        RETURN(rc);
+}
+
+static void lustre_swab_hai(struct hsm_action_item *h)
+{
+        __swab32s(&h->hai_len);
+        __swab32s(&h->hai_action);
+        lustre_swab_lu_fid(&h->hai_fid);
+        __swab64s(&h->hai_cookie);
+        __swab64s(&h->hai_extent_start);
+        __swab64s(&h->hai_extent_end);
+        __swab64s(&h->hai_gid);
+}
+
+static void lustre_swab_hal(struct hsm_action_list *h)
+{
+        struct hsm_action_item *hai;
+        int i;
+
+        __swab32s(&h->hal_version);
+        __swab32s(&h->hal_count);
+        __swab32s(&h->hal_archive_num);
+        hai = hai_zero(h);
+        for (i = 0; i < h->hal_count; i++) {
+                lustre_swab_hai(hai);
+                hai = hai_next(hai);
+        }
+}
 
-                GOTO(out, rc);
+static int mdc_ioc_hsm_ct_start(struct obd_export *exp,
+                                struct lustre_kernelcomm *lk)
+{
+        int rc = 0;
+
+        if (lk->lk_group != KUC_GRP_HSM) {
+                CERROR("Bad copytool group %d\n", lk->lk_group);
+                return -EINVAL;
         }
-#endif
-        default:
-                CERROR("mdc_ioctl(): unrecognised ioctl %#x\n", cmd);
-                GOTO(out, rc = -ENOTTY);
+
+        CDEBUG(D_HSM, "CT start r%d w%d u%d g%d f%#x\n", lk->lk_rfd, lk->lk_wfd,
+               lk->lk_uid, lk->lk_group, lk->lk_flags);
+
+        if (lk->lk_flags & LK_FLG_STOP)
+                rc = libcfs_kkuc_group_rem(lk->lk_uid,lk->lk_group);
+        else {
+                cfs_file_t *fp = cfs_get_fd(lk->lk_wfd);
+                rc = libcfs_kkuc_group_add(fp, lk->lk_uid,lk->lk_group);
+                if (rc && fp)
+                        cfs_put_file(fp);
         }
-out:
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0))
-        MOD_DEC_USE_COUNT;
-#else
-        module_put(THIS_MODULE);
-#endif
+
+        /* lk_data is archive number mask */
+        /* TODO: register archive num with mdt so coordinator can choose
+           correct agent. */
 
         return rc;
 }
 
-int mdc_set_info(struct obd_export *exp, obd_count keylen,
-                 void *key, obd_count vallen, void *val)
+/**
+ * Send a message to any listening copytools
+ * @param val KUC message (kuc_hdr + hsm_action_list)
+ * @param len total length of message
+ */
+static int mdc_hsm_copytool_send(int len, void *val)
 {
-        int rc = -EINVAL;
+        struct kuc_hdr *lh = (struct kuc_hdr *)val;
+        struct hsm_action_list *hal = (struct hsm_action_list *)(lh + 1);
+        int rc;
+        ENTRY;
+
+        if (len < sizeof(*lh) + sizeof(*hal)) {
+                CERROR("Short HSM message %d < %d\n", len,
+                      (int) (sizeof(*lh) + sizeof(*hal)));
+                RETURN(-EPROTO);
+        }
+        if (lh->kuc_magic == __swab16(KUC_MAGIC)) {
+                lustre_swab_kuch(lh);
+                lustre_swab_hal(hal);
+        } else if (lh->kuc_magic != KUC_MAGIC) {
+                CERROR("Bad magic %x!=%x\n", lh->kuc_magic, KUC_MAGIC);
+                RETURN(-EPROTO);
+        }
+
+        CDEBUG(D_HSM, " Received message mg=%x t=%d m=%d l=%d actions=%d\n",
+               lh->kuc_magic, lh->kuc_transport, lh->kuc_msgtype,
+               lh->kuc_msglen, hal->hal_count);
+
+        /* Broadcast to HSM listeners */
+        rc = libcfs_kkuc_group_put(KUC_GRP_HSM, lh);
+
+        RETURN(rc);
+}
+
+int mdc_set_info_async(struct obd_export *exp,
+                       obd_count keylen, void *key,
+                       obd_count vallen, void *val,
+                       struct ptlrpc_request_set *set)
+{
+        struct obd_import *imp = class_exp2cliimp(exp);
+        int                rc = -EINVAL;
+        ENTRY;
 
-        if (keylen == strlen("initial_recov") &&
-            memcmp(key, "initial_recov", strlen("initial_recov")) == 0) {
-                struct obd_import *imp = exp->exp_obd->u.cli.cl_import;
+        if (KEY_IS(KEY_INIT_RECOV)) {
                 if (vallen != sizeof(int))
                         RETURN(-EINVAL);
+                cfs_spin_lock(&imp->imp_lock);
                 imp->imp_initial_recov = *(int *)val;
-                CDEBUG(D_HA, "%s: set imp_no_init_recov = %d\n",
-                       exp->exp_obd->obd_name,
-                       imp->imp_initial_recov);
+                cfs_spin_unlock(&imp->imp_lock);
+                CDEBUG(D_HA, "%s: set imp_initial_recov = %d\n",
+                       exp->exp_obd->obd_name, imp->imp_initial_recov);
                 RETURN(0);
-        } else if ((keylen >= strlen("crypto_type")) && 
-                    strcmp(key, "crypto_type") == 0) {
-                struct ptlrpc_request *req;
-                char *bufs[2] = {key, val};
-                int rc, size[2] = {keylen, vallen};
-
-                req = ptlrpc_prep_req(class_exp2cliimp(exp), LUSTRE_OBD_VERSION,
-                                      OST_SET_INFO, 2, size, bufs);
-                if (req == NULL)
-                        RETURN(-ENOMEM);
-
-                req->rq_replen = lustre_msg_size(0, NULL);
-                rc = ptlrpc_queue_wait(req);
-                ptlrpc_req_finished(req);
-                RETURN(rc);
-        } else if (keylen >= strlen("inter_mds") && strcmp(key, "inter_mds") == 0) {
-                struct obd_import *imp = class_exp2cliimp(exp);
-                imp->imp_server_timeout = 1;
-                CDEBUG(D_OTHER, "%s: timeout / 2\n", exp->exp_obd->obd_name);
+        }
+        /* Turn off initial_recov after we try all backup servers once */
+        if (KEY_IS(KEY_INIT_RECOV_BACKUP)) {
+                if (vallen != sizeof(int))
+                        RETURN(-EINVAL);
+                cfs_spin_lock(&imp->imp_lock);
+                imp->imp_initial_recov_bk = *(int *)val;
+                if (imp->imp_initial_recov_bk)
+                        imp->imp_initial_recov = 1;
+                cfs_spin_unlock(&imp->imp_lock);
+                CDEBUG(D_HA, "%s: set imp_initial_recov_bk = %d\n",
+                       exp->exp_obd->obd_name, imp->imp_initial_recov_bk);
                 RETURN(0);
-        } else if (keylen == strlen("sec") &&
-                   memcmp(key, "sec", keylen) == 0) {
-                struct client_obd *cli = &exp->exp_obd->u.cli;
-
-                cli->cl_sec_flavor = ptlrpcs_name2flavor(val);
-                if (cli->cl_sec_flavor == PTLRPCS_FLVR_INVALID) {
-                        CERROR("unrecognized security type %s\n", (char*) val);
+        }
+        if (KEY_IS(KEY_READ_ONLY)) {
+                if (vallen != sizeof(int))
                         RETURN(-EINVAL);
-                }
 
-                RETURN(0);
-        } else if (keylen == strlen("sec_flags") &&
-                   memcmp(key, "sec_flags", keylen) == 0) {
-                struct client_obd *cli = &exp->exp_obd->u.cli;
+                cfs_spin_lock(&imp->imp_lock);
+                if (*((int *)val)) {
+                        imp->imp_connect_flags_orig |= OBD_CONNECT_RDONLY;
+                        imp->imp_connect_data.ocd_connect_flags |= OBD_CONNECT_RDONLY;
+                } else {
+                        imp->imp_connect_flags_orig &= ~OBD_CONNECT_RDONLY;
+                        imp->imp_connect_data.ocd_connect_flags &= ~OBD_CONNECT_RDONLY;
+                }
+                cfs_spin_unlock(&imp->imp_lock);
 
-                cli->cl_sec_flags = *((unsigned long *) val);
+                rc = do_set_info_async(imp, MDS_SET_INFO, LUSTRE_MDS_VERSION,
+                                       keylen, key, vallen, val, set);
+                RETURN(rc);
+        }
+        if (KEY_IS(KEY_SPTLRPC_CONF)) {
+                sptlrpc_conf_client_adapt(exp->exp_obd);
                 RETURN(0);
-        } else if (keylen == strlen("flush_cred") &&
-                   memcmp(key, "flush_cred", keylen) == 0) {
-                struct client_obd *cli = &exp->exp_obd->u.cli;
-
-                if (cli->cl_import)
-                        ptlrpcs_import_flush_current_creds(cli->cl_import);
+        }
+        if (KEY_IS(KEY_FLUSH_CTX)) {
+                sptlrpc_import_flush_my_ctx(imp);
                 RETURN(0);
-        } else if (keylen == strlen("async") && memcmp(key, "async", keylen) == 0) {
-                struct client_obd *cl = &exp->exp_obd->u.cli;
-                if (vallen != sizeof(int))
-                        RETURN(-EINVAL);
-                cl->cl_async = *(int *)val;
-                CDEBUG(D_HA, "%s: set async = %d\n",
-                       exp->exp_obd->obd_name, cl->cl_async);
+        }
+        if (KEY_IS(KEY_MDS_CONN)) {
+                /* mds-mds import */
+                cfs_spin_lock(&imp->imp_lock);
+                imp->imp_server_timeout = 1;
+                cfs_spin_unlock(&imp->imp_lock);
+                imp->imp_client->cli_request_portal = MDS_MDS_PORTAL;
+                CDEBUG(D_OTHER, "%s: timeout / 2\n", exp->exp_obd->obd_name);
                 RETURN(0);
-        } else if (keylen == strlen("setext") && memcmp(key, "setext", keylen) == 0) {
-                struct ptlrpc_request *req;
-                char *bufs[2] = {key, val};
-                int rc, size[2] = {keylen, vallen};
-
-                req = ptlrpc_prep_req(class_exp2cliimp(exp), LUSTRE_OBD_VERSION,
-                                      OST_SET_INFO, 2, size, bufs);
-                if (req == NULL)
-                        RETURN(-ENOMEM);
-
-                req->rq_replen = lustre_msg_size(0, NULL);
-                rc = ptlrpc_queue_wait(req);
-                ptlrpc_req_finished(req);
-                RETURN(rc);
-        } else if (keylen == 5 && strcmp(key, "audit") == 0) {
-                struct ptlrpc_request *req;
-                char *bufs[2] = {key, val};
-                int rc, size[2] = {keylen, vallen};
-
-                req = ptlrpc_prep_req(class_exp2cliimp(exp), LUSTRE_OBD_VERSION,
-                                      OST_SET_INFO, 2, size, bufs);
-                if (req == NULL)
-                        RETURN(-ENOMEM);
-
-                req->rq_replen = lustre_msg_size(0, NULL);
-                lustre_swab_reqbuf(req, 1, sizeof(struct audit_attr_msg),
-                                   lustre_swab_audit_attr);
-                rc = ptlrpc_queue_wait(req);
-                ptlrpc_req_finished(req);
-
+        }
+        if (KEY_IS(KEY_CHANGELOG_CLEAR)) {
+                rc = do_set_info_async(imp, MDS_SET_INFO, LUSTRE_MDS_VERSION,
+                                       keylen, key, vallen, val, set);
                 RETURN(rc);
-        } else if (keylen == strlen("ids") && memcmp(key, "ids", keylen) == 0) {
-                struct ptlrpc_request *req;
-                struct lustre_id *ids = (struct lustre_id *)val;
-                char *bufs[3] = {key, (char *)ids, (char *)(ids + 1)};
-                int rc, size[3] = {keylen, sizeof(struct lustre_id), 
-                                   sizeof(struct lustre_id)};
-
-                req = ptlrpc_prep_req(class_exp2cliimp(exp), LUSTRE_OBD_VERSION,
-                                      OST_SET_INFO, 3, size, bufs);
-                if (req == NULL)
-                        RETURN(-ENOMEM);
-
-                req->rq_replen = lustre_msg_size(0, NULL);
-                rc = ptlrpc_queue_wait(req);
-                ptlrpc_req_finished(req);
+        }
+        if (KEY_IS(KEY_HSM_COPYTOOL_SEND)) {
+                rc = mdc_hsm_copytool_send(vallen, val);
                 RETURN(rc);
         }
+
         RETURN(rc);
 }
 
-static int mdc_statfs(struct obd_device *obd, struct obd_statfs *osfs,
-                      unsigned long max_age)
+int mdc_get_info(struct obd_export *exp, __u32 keylen, void *key,
+                 __u32 *vallen, void *val, struct lov_stripe_md *lsm)
 {
-        struct obd_statfs *msfs;
-        struct ptlrpc_request *req;
-        int rc, size = sizeof(*msfs);
-        ENTRY;
+        int rc = -EINVAL;
 
-        /* We could possibly pass max_age in the request (as an absolute
-         * timestamp or a "seconds.usec ago") so the target can avoid doing
-         * extra calls into the filesystem if that isn't necessary (e.g.
-         * during mount that would help a bit).  Having relative timestamps
-         * is not so great if request processing is slow, while absolute
-         * timestamps are not ideal because they need time synchronization. */
-        req = ptlrpc_prep_req(obd->u.cli.cl_import, LUSTRE_MDS_VERSION,
-                              MDS_STATFS, 0, NULL, NULL);
-        if (!req)
-                RETURN(-ENOMEM);
+        if (KEY_IS(KEY_MAX_EASIZE)) {
+                int mdsize, *max_easize;
 
-        req->rq_replen = lustre_msg_size(1, &size);
+                if (*vallen != sizeof(int))
+                        RETURN(-EINVAL);
+                mdsize = *(int*)val;
+                if (mdsize > exp->exp_obd->u.cli.cl_max_mds_easize)
+                        exp->exp_obd->u.cli.cl_max_mds_easize = mdsize;
+                max_easize = val;
+                *max_easize = exp->exp_obd->u.cli.cl_max_mds_easize;
+                RETURN(0);
+        }
+        if (KEY_IS(KEY_CONN_DATA)) {
+                struct obd_import *imp = class_exp2cliimp(exp);
+                struct obd_connect_data *data = val;
 
-        mdc_get_rpc_lock(obd->u.cli.cl_rpc_lock, NULL);
-        rc = ptlrpc_queue_wait(req);
-        mdc_put_rpc_lock(obd->u.cli.cl_rpc_lock, NULL);
+                if (*vallen != sizeof(*data))
+                        RETURN(-EINVAL);
 
-        if (rc) {
-                /* this can be LMV fake import, whcih is not connected. */
-                if (!req->rq_import->imp_connection)
-                        memset(osfs, 0, sizeof(*osfs));
-                GOTO(out, rc);
+                *data = imp->imp_connect_data;
+                RETURN(0);
         }
 
-        msfs = lustre_swab_repbuf(req, 0, sizeof(*msfs),
-                                  lustre_swab_obd_statfs);
-        if (msfs == NULL) {
-                CERROR("Can't unpack obd_statfs\n");
-                GOTO(out, rc = -EPROTO);
-        }
+        rc = mdc_get_info_rpc(exp, keylen, key, *vallen, val);
 
-        memcpy(osfs, msfs, sizeof (*msfs));
-        EXIT;
-out:
-        ptlrpc_req_finished(req);
-        return rc;
+        RETURN(rc);
 }
 
-static int mdc_pin(struct obd_export *exp, obd_id ino, __u32 gen, int type,
-                   struct obd_client_handle *handle, int flag)
+static int mdc_pin(struct obd_export *exp, const struct lu_fid *fid,
+                   struct obd_capa *oc, struct obd_client_handle *handle,
+                   int flags)
 {
         struct ptlrpc_request *req;
-        struct mds_body *body;
-        int rc, size[2] = {0, sizeof(*body)};
+        struct mdt_body       *body;
+        int                    rc;
         ENTRY;
 
-        //size[0] = lustre_secdesc_size();
-
-        req = ptlrpc_prep_req(class_exp2cliimp(exp), LUSTRE_MDS_VERSION,
-                              MDS_PIN, 2, size, NULL);
+        req = ptlrpc_request_alloc(class_exp2cliimp(exp), &RQF_MDS_PIN);
         if (req == NULL)
                 RETURN(-ENOMEM);
 
-        //lustre_pack_secdesc(req, size[0]);
+        mdc_set_capa_size(req, &RMF_CAPA1, oc);
 
-        body = lustre_msg_buf(req->rq_reqmsg, 
-                              MDS_REQ_REC_OFF, sizeof(*body));
+        rc = ptlrpc_request_pack(req, LUSTRE_MDS_VERSION, MDS_PIN);
+        if (rc) {
+                ptlrpc_request_free(req);
+                RETURN(rc);
+        }
 
-        /* FIXME-UMKA: here should be also mdsnum and fid. */
-        mdc_pack_id(&body->id1, ino, gen, type, 0, 0);
-        body->flags = flag;
+        mdc_pack_body(req, fid, oc, 0, 0, -1, flags);
 
-        req->rq_replen = lustre_msg_size(1, &size[1]);
+        ptlrpc_request_set_replen(req);
 
         mdc_get_rpc_lock(exp->exp_obd->u.cli.cl_rpc_lock, NULL);
         rc = ptlrpc_queue_wait(req);
         mdc_put_rpc_lock(exp->exp_obd->u.cli.cl_rpc_lock, NULL);
         if (rc) {
-                CERROR("pin failed: %d\n", rc);
-                ptlrpc_req_finished(req);
-                RETURN(rc);
+                CERROR("Pin failed: %d\n", rc);
+                GOTO(err_out, rc);
         }
 
-        body = lustre_swab_repbuf(req, 0, sizeof(*body), lustre_swab_mds_body);
-        if (body == NULL) {
-                ptlrpc_req_finished(req);
-                RETURN(rc);
-        }
+        body = req_capsule_server_get(&req->rq_pill, &RMF_MDT_BODY);
+        if (body == NULL)
+                GOTO(err_out, rc = -EPROTO);
 
-        memcpy(&handle->och_fh, &body->handle, sizeof(body->handle));
+        handle->och_fh = body->handle;
         handle->och_magic = OBD_CLIENT_HANDLE_MAGIC;
 
-        OBD_ALLOC(handle->och_mod, sizeof(*handle->och_mod));
+        handle->och_mod = obd_mod_alloc();
         if (handle->och_mod == NULL) {
-                DEBUG_REQ(D_ERROR, req, "can't allocate mdc_open_data");
-                RETURN(-ENOMEM);
+                DEBUG_REQ(D_ERROR, req, "can't allocate md_open_data");
+                GOTO(err_out, rc = -ENOMEM);
         }
         handle->och_mod->mod_open_req = req; /* will be dropped by unpin */
 
+        RETURN(0);
+
+err_out:
+        ptlrpc_req_finished(req);
         RETURN(rc);
 }
 
-static int mdc_unpin(struct obd_export *exp,
-                     struct obd_client_handle *handle, int flag)
+static int mdc_unpin(struct obd_export *exp, struct obd_client_handle *handle,
+                     int flag)
 {
         struct ptlrpc_request *req;
-        struct mds_body *body;
-        int rc, size[2] = {0, sizeof(*body)};
+        struct mdt_body       *body;
+        int                    rc;
         ENTRY;
 
-        if (handle->och_magic != OBD_CLIENT_HANDLE_MAGIC)
-                RETURN(0);
-
-        //size[0] = lustre_secdesc_size();
-
-        req = ptlrpc_prep_req(class_exp2cliimp(exp), LUSTRE_MDS_VERSION,
-                              MDS_CLOSE, 2, size, NULL);
+        req = ptlrpc_request_alloc_pack(class_exp2cliimp(exp), &RQF_MDS_UNPIN,
+                                        LUSTRE_MDS_VERSION, MDS_UNPIN);
         if (req == NULL)
                 RETURN(-ENOMEM);
 
-        //lustre_pack_secdesc(req, size[0]);
-
-        body = lustre_msg_buf(req->rq_reqmsg, MDS_REQ_REC_OFF, sizeof(*body));
-        memcpy(&body->handle, &handle->och_fh, sizeof(body->handle));
+        body = req_capsule_client_get(&req->rq_pill, &RMF_MDT_BODY);
+        body->handle = handle->och_fh;
         body->flags = flag;
 
-        req->rq_replen = lustre_msg_size(0, NULL);
+        ptlrpc_request_set_replen(req);
+
         mdc_get_rpc_lock(exp->exp_obd->u.cli.cl_rpc_lock, NULL);
         rc = ptlrpc_queue_wait(req);
         mdc_put_rpc_lock(exp->exp_obd->u.cli.cl_rpc_lock, NULL);
 
         if (rc != 0)
-                CERROR("unpin failed: %d\n", rc);
+                CERROR("Unpin failed: %d\n", rc);
 
         ptlrpc_req_finished(req);
         ptlrpc_req_finished(handle->och_mod->mod_open_req);
-        OBD_FREE(handle->och_mod, sizeof(*handle->och_mod));
+
+        obd_mod_put(handle->och_mod);
         RETURN(rc);
 }
 
-int mdc_sync(struct obd_export *exp, struct lustre_id *id,
-             struct ptlrpc_request **request)
+int mdc_sync(struct obd_export *exp, const struct lu_fid *fid,
+             struct obd_capa *oc, struct ptlrpc_request **request)
 {
         struct ptlrpc_request *req;
-        struct mds_body *body;
-        int size[2] = {0, sizeof(*body)};
-        int rc;
+        int                    rc;
         ENTRY;
 
-        //size[0] = lustre_secdesc_size();
-
-        req = ptlrpc_prep_req(class_exp2cliimp(exp), LUSTRE_MDS_VERSION,
-                              MDS_SYNC, 2, size, NULL);
-        if (!req)
-                RETURN(rc = -ENOMEM);
+        *request = NULL;
+        req = ptlrpc_request_alloc(class_exp2cliimp(exp), &RQF_MDS_SYNC);
+        if (req == NULL)
+                RETURN(-ENOMEM);
 
-        //lustre_pack_secdesc(req, size[0]);
+        mdc_set_capa_size(req, &RMF_CAPA1, oc);
 
-        if (id) {
-                body = lustre_msg_buf(req->rq_reqmsg, MDS_REQ_REC_OFF,
-                                      sizeof (*body));
-                memcpy(&body->id1, id, sizeof(*id));
+        rc = ptlrpc_request_pack(req, LUSTRE_MDS_VERSION, MDS_SYNC);
+        if (rc) {
+                ptlrpc_request_free(req);
+                RETURN(rc);
         }
 
-        req->rq_replen = lustre_msg_size(1, &size[1]);
+        mdc_pack_body(req, fid, oc, 0, 0, -1, 0);
+
+        ptlrpc_request_set_replen(req);
 
         rc = ptlrpc_queue_wait(req);
-        if (rc || request == NULL)
+        if (rc)
                 ptlrpc_req_finished(req);
         else
                 *request = req;
-
         RETURN(rc);
 }
 
@@ -1268,11 +1798,25 @@ static int mdc_import_event(struct obd_device *obd, struct obd_import *imp,
 
         switch (event) {
         case IMP_EVENT_DISCON: {
+#if 0
+                /* XXX Pass event up to OBDs stack. used only for FLD now */
+                rc = obd_notify_observer(obd, obd, OBD_NOTIFY_DISCON, NULL);
+#endif
                 break;
         }
         case IMP_EVENT_INACTIVE: {
-                if (obd->obd_observer)
-                        rc = obd_notify(obd->obd_observer, obd, 0, 0);
+                struct client_obd *cli = &obd->u.cli;
+                /*
+                 * Flush current sequence to make client obtain new one
+                 * from server in case of disconnect/reconnect.
+                 * If range is already empty then no need to flush it.
+                 */
+                if (cli->cl_seq != NULL &&
+                    !range_is_exhausted(&cli->cl_seq->lcs_space)) {
+                        seq_client_flush(cli->cl_seq);
+                }
+
+                rc = obd_notify_observer(obd, obd, OBD_NOTIFY_INACTIVE, NULL);
                 break;
         }
         case IMP_EVENT_INVALIDATE: {
@@ -1283,33 +1827,95 @@ static int mdc_import_event(struct obd_device *obd, struct obd_import *imp,
                 break;
         }
         case IMP_EVENT_ACTIVE: {
-                if (obd->obd_observer)
-                        rc = obd_notify(obd->obd_observer, obd, 1, 0);
+                rc = obd_notify_observer(obd, obd, OBD_NOTIFY_ACTIVE, NULL);
                 break;
         }
+        case IMP_EVENT_OCD:
+                rc = obd_notify_observer(obd, obd, OBD_NOTIFY_OCD, NULL);
+                break;
+
         default:
-                CERROR("Unknown import event %d\n", event);
+                CERROR("Unknown import event %x\n", event);
                 LBUG();
         }
         RETURN(rc);
 }
 
-static int mdc_attach(struct obd_device *dev, obd_count len, void *data)
+static int mdc_fid_init(struct obd_export *exp)
+{
+        struct client_obd *cli = &exp->exp_obd->u.cli;
+        char *prefix;
+        int rc;
+        ENTRY;
+
+        OBD_ALLOC_PTR(cli->cl_seq);
+        if (cli->cl_seq == NULL)
+                RETURN(-ENOMEM);
+
+        OBD_ALLOC(prefix, MAX_OBD_NAME + 5);
+        if (prefix == NULL)
+                GOTO(out_free_seq, rc = -ENOMEM);
+
+        snprintf(prefix, MAX_OBD_NAME + 5, "srv-%s",
+                 exp->exp_obd->obd_name);
+
+        /* Init client side sequence-manager */
+        rc = seq_client_init(cli->cl_seq, exp,
+                             LUSTRE_SEQ_METADATA,
+                             prefix, NULL);
+        OBD_FREE(prefix, MAX_OBD_NAME + 5);
+        if (rc)
+                GOTO(out_free_seq, rc);
+
+        RETURN(rc);
+out_free_seq:
+        OBD_FREE_PTR(cli->cl_seq);
+        cli->cl_seq = NULL;
+        return rc;
+}
+
+static int mdc_fid_fini(struct obd_export *exp)
 {
-        struct lprocfs_static_vars lvars;
+        struct client_obd *cli = &exp->exp_obd->u.cli;
+        ENTRY;
+
+        if (cli->cl_seq != NULL) {
+                seq_client_fini(cli->cl_seq);
+                OBD_FREE_PTR(cli->cl_seq);
+                cli->cl_seq = NULL;
+        }
+
+        RETURN(0);
+}
 
-        lprocfs_init_vars(mdc, &lvars);
-        return lprocfs_obd_attach(dev, lvars.obd_vars);
+int mdc_fid_alloc(struct obd_export *exp, struct lu_fid *fid,
+                  struct md_op_data *op_data)
+{
+        struct client_obd *cli = &exp->exp_obd->u.cli;
+        struct lu_client_seq *seq = cli->cl_seq;
+        ENTRY;
+        RETURN(seq_client_alloc_fid(seq, fid));
 }
 
-static int mdc_detach(struct obd_device *dev)
+/* XXX This method is used only to clear current fid seq
+ * once fld/mds insert failed */
+static int mdc_fid_delete(struct obd_export *exp, const struct lu_fid *fid)
 {
-        return lprocfs_obd_detach(dev);
+        struct client_obd *cli = &exp->exp_obd->u.cli;
+
+        seq_client_flush(cli->cl_seq);
+        return 0;
+}
+
+struct obd_uuid *mdc_get_uuid(struct obd_export *exp) {
+        struct client_obd *cli = &exp->exp_obd->u.cli;
+        return &cli->cl_target_uuid;
 }
 
-static int mdc_setup(struct obd_device *obd, obd_count len, void *buf)
+static int mdc_setup(struct obd_device *obd, struct lustre_cfg *cfg)
 {
         struct client_obd *cli = &obd->u.cli;
+        struct lprocfs_static_vars lvars = { 0 };
         int rc;
         ENTRY;
 
@@ -1330,13 +1936,17 @@ static int mdc_setup(struct obd_device *obd, obd_count len, void *buf)
                 GOTO(err_setattr_lock, rc = -ENOMEM);
         mdc_init_rpc_lock(cli->cl_close_lock);
 
-        rc = client_obd_setup(obd, len, buf);
+        rc = client_obd_setup(obd, cfg);
         if (rc)
                 GOTO(err_close_lock, rc);
+        lprocfs_mdc_init_vars(&lvars);
+        lprocfs_obd_setup(obd, lvars.obd_vars);
+        sptlrpc_lprocfs_cliobd_attach(obd);
+        ptlrpc_lprocfs_register_obd(obd);
 
-        rc = obd_llog_init(obd, &obd->obd_llogs, obd, 0, NULL);
+        rc = obd_llog_init(obd, &obd->obd_olg, obd, NULL);
         if (rc) {
-                mdc_cleanup(obd, 0);
+                mdc_cleanup(obd);
                 CERROR("failed to setup llogging subsystems\n");
         }
 
@@ -1352,7 +1962,12 @@ err_rpc_lock:
         RETURN(rc);
 }
 
-static int mdc_init_ea_size(struct obd_export *exp, int easize, int cookiesize)
+/* Initialize the default and maximum LOV EA and cookie sizes.  This allows
+ * us to make MDS RPCs with large enough reply buffers to hold the
+ * maximum-sized (= maximum striped) EA and cookie without having to
+ * calculate this (via a call into the LOV + OSCs) each time we make an RPC. */
+static int mdc_init_ea_size(struct obd_export *exp, int easize,
+                     int def_easize, int cookiesize)
 {
         struct obd_device *obd = exp->exp_obd;
         struct client_obd *cli = &obd->u.cli;
@@ -1360,23 +1975,50 @@ static int mdc_init_ea_size(struct obd_export *exp, int easize, int cookiesize)
 
         if (cli->cl_max_mds_easize < easize)
                 cli->cl_max_mds_easize = easize;
+
+        if (cli->cl_default_mds_easize < def_easize)
+                cli->cl_default_mds_easize = def_easize;
+
         if (cli->cl_max_mds_cookiesize < cookiesize)
                 cli->cl_max_mds_cookiesize = cookiesize;
+
         RETURN(0);
 }
 
-static int mdc_precleanup(struct obd_device *obd, int flags)
+static int mdc_precleanup(struct obd_device *obd, enum obd_cleanup_stage stage)
 {
         int rc = 0;
-        
-        rc = obd_llog_finish(obd, &obd->obd_llogs, 0);
-        if (rc != 0)
-                CERROR("failed to cleanup llogging subsystems\n");
+        ENTRY;
 
+        switch (stage) {
+        case OBD_CLEANUP_EARLY:
+                break;
+        case OBD_CLEANUP_EXPORTS:
+                /* Failsafe, ok if racy */
+                if (obd->obd_type->typ_refcnt <= 1)
+                        libcfs_kkuc_group_rem(0, KUC_GRP_HSM);
+
+                /* If we set up but never connected, the
+                   client import will not have been cleaned. */
+                if (obd->u.cli.cl_import) {
+                        struct obd_import *imp;
+                        cfs_down_write(&obd->u.cli.cl_sem);
+                        imp = obd->u.cli.cl_import;
+                        CERROR("client import never connected\n");
+                        ptlrpc_invalidate_import(imp);
+                        class_destroy_import(imp);
+                        cfs_up_write(&obd->u.cli.cl_sem);
+                        obd->u.cli.cl_import = NULL;
+                }
+                rc = obd_llog_finish(obd, 0);
+                if (rc != 0)
+                        CERROR("failed to cleanup llogging subsystems\n");
+                break;
+        }
         RETURN(rc);
 }
 
-static int mdc_cleanup(struct obd_device *obd, int flags)
+static int mdc_cleanup(struct obd_device *obd)
 {
         struct client_obd *cli = &obd->u.cli;
 
@@ -1384,412 +2026,283 @@ static int mdc_cleanup(struct obd_device *obd, int flags)
         OBD_FREE(cli->cl_setattr_lock, sizeof (*cli->cl_setattr_lock));
         OBD_FREE(cli->cl_close_lock, sizeof (*cli->cl_close_lock));
 
+        ptlrpc_lprocfs_unregister_obd(obd);
+        lprocfs_obd_cleanup(obd);
         ptlrpcd_decref();
 
-        return client_obd_cleanup(obd, flags);
+        return client_obd_cleanup(obd);
 }
 
 
-static int mdc_llog_init(struct obd_device *obd, struct obd_llogs *llogs, 
-                         struct obd_device *tgt, int count,
-                         struct llog_catid *logid)
+static int mdc_llog_init(struct obd_device *obd, struct obd_llog_group *olg,
+                         struct obd_device *tgt, int *index)
 {
         struct llog_ctxt *ctxt;
         int rc;
         ENTRY;
 
-        rc = obd_llog_setup(obd, llogs, LLOG_CONFIG_REPL_CTXT, tgt, 0, NULL,
-                            &llog_client_ops);
+        LASSERT(olg == &obd->obd_olg);
+
+        rc = llog_setup(obd, olg, LLOG_LOVEA_REPL_CTXT, tgt, 0, NULL,
+                        &llog_client_ops);
+        if (rc)
+                RETURN(rc);
+
+        ctxt = llog_get_context(obd, LLOG_LOVEA_REPL_CTXT);
+        llog_initiator_connect(ctxt);
+        llog_ctxt_put(ctxt);
+
+        rc = llog_setup(obd, olg, LLOG_CHANGELOG_REPL_CTXT, tgt, 0, NULL,
+                        &llog_client_ops);
         if (rc == 0) {
-                ctxt = llog_get_context(llogs, LLOG_CONFIG_REPL_CTXT);
-                ctxt->loc_imp = obd->u.cli.cl_import;
+                ctxt = llog_group_get_ctxt(olg, LLOG_CHANGELOG_REPL_CTXT);
+                llog_initiator_connect(ctxt);
+                llog_ctxt_put(ctxt);
         }
 
         RETURN(rc);
 }
 
-static int mdc_llog_finish(struct obd_device *obd,
-                           struct obd_llogs *llogs, int count)
+static int mdc_llog_finish(struct obd_device *obd, int count)
 {
-        int rc;
+        struct llog_ctxt *ctxt;
+        int rc = 0;
         ENTRY;
 
-        rc = obd_llog_cleanup(llog_get_context(llogs, LLOG_CONFIG_REPL_CTXT));
+        ctxt = llog_get_context(obd, LLOG_LOVEA_REPL_CTXT);
+        if (ctxt)
+                rc = llog_cleanup(ctxt);
+
+        ctxt = llog_get_context(obd, LLOG_CHANGELOG_REPL_CTXT);
+        if (ctxt)
+                rc = llog_cleanup(ctxt);
+
         RETURN(rc);
 }
 
-static struct obd_device *mdc_get_real_obd(struct obd_export *exp,
-                                           struct lustre_id *id)
+static int mdc_process_config(struct obd_device *obd, obd_count len, void *buf)
 {
-       ENTRY;
-       RETURN(exp->exp_obd);
+        struct lustre_cfg *lcfg = buf;
+        struct lprocfs_static_vars lvars = { 0 };
+        int rc = 0;
+
+        lprocfs_mdc_init_vars(&lvars);
+        switch (lcfg->lcfg_command) {
+        default:
+                rc = class_process_proc_param(PARAM_MDC, lvars.obd_vars,
+                                              lcfg, obd);
+                if (rc > 0)
+                        rc = 0;
+                break;
+        }
+        return(rc);
 }
 
-static int mdc_get_info(struct obd_export *exp, __u32 keylen,
-                        void *key, __u32 *valsize, void *val)
+
+/* get remote permission for current user on fid */
+int mdc_get_remote_perm(struct obd_export *exp, const struct lu_fid *fid,
+                        struct obd_capa *oc, __u32 suppgid,
+                        struct ptlrpc_request **request)
 {
-        struct ptlrpc_request *req;
-        char *bufs[1] = {key};
-        int rc = 0;
+        struct ptlrpc_request  *req;
+        int                    rc;
         ENTRY;
-        
-        if (!valsize || !val)
-                RETURN(-EFAULT);
 
-        if (keylen >= strlen("remote_flag") && !strcmp(key, "remote_flag")) {
-                struct obd_import *imp;
-                struct obd_connect_data *data;
+        LASSERT(client_is_remote(exp));
 
-                imp = class_exp2cliimp(exp);
-                if (!imp) {
-                        LBUG();
-                        RETURN(-EINVAL);
-                }
+        *request = NULL;
+        req = ptlrpc_request_alloc(class_exp2cliimp(exp), &RQF_MDS_GETATTR);
+        if (req == NULL)
+                RETURN(-ENOMEM);
 
-                if (imp->imp_state != LUSTRE_IMP_FULL) {
-                        CERROR("import state not full\n");
-                        RETURN(-EINVAL);
-                }
+        mdc_set_capa_size(req, &RMF_CAPA1, oc);
 
-                data = &imp->imp_connect_data;
-                if (data->ocd_connect_flags & OBD_CONNECT_REMOTE) {
-                        *((int *)val) = 1;
-                        RETURN(0);
-                } else if (data->ocd_connect_flags & OBD_CONNECT_LOCAL) {
-                        *((int *)val) = 0;
-                        RETURN(0);
-                }
-                CERROR("no remote flag set?\n");
-                RETURN(-EINVAL);
+        rc = ptlrpc_request_pack(req, LUSTRE_MDS_VERSION, MDS_GETATTR);
+        if (rc) {
+                ptlrpc_request_free(req);
+                RETURN(rc);
         }
 
-        if ((keylen < strlen("mdsize") || strcmp(key, "mdsize") != 0) &&
-            (keylen < strlen("mdsnum") || strcmp(key, "mdsnum") != 0) &&
-            (keylen < strlen("lovdesc") || strcmp(key, "lovdesc") != 0) &&
-            (keylen < strlen("getext") || strcmp(key, "getext") != 0) &&
-            (keylen < strlen("rootid") || strcmp(key, "rootid") != 0) &&
-            (keylen < strlen("auditid") || strcmp(key, "auditid") != 0))
-                RETURN(-EPROTO);
-                
-        req = ptlrpc_prep_req(class_exp2cliimp(exp), LUSTRE_OBD_VERSION,
-                              OST_GET_INFO, 1, (int *)&keylen, bufs);
-        if (req == NULL)
-                RETURN(-ENOMEM);
-
-        req->rq_replen = lustre_msg_size(1, (int *)valsize);
-        rc = ptlrpc_queue_wait(req);
-        if (rc)
-                GOTO(out_req, rc);
-
-        if ((keylen >= strlen("rootid") && !strcmp(key, "rootid")) ||
-            (keylen >= strlen("auditid") && !strcmp(key, "auditid"))) {
-                struct lustre_id *reply;
-                
-                reply = lustre_swab_repbuf(req, 0, sizeof(*reply),
-                                           lustre_swab_lustre_id);
-                if (reply == NULL) {
-                        CERROR("Can't unpack %s\n", (char *)key);
-                        GOTO(out_req, rc = -EPROTO);
-                }
+        mdc_pack_body(req, fid, oc, OBD_MD_FLRMTPERM, 0, suppgid, 0);
 
-                *(struct lustre_id *)val = *reply;
-        } else if (keylen >= strlen("lovdesc") && !strcmp(key, "lovdesc")) {
-                struct lov_desc *reply;
-                
-                reply = lustre_swab_repbuf(req, 0, sizeof(*reply),
-                                           lustre_swab_lov_desc);
-                if (reply == NULL) {
-                        CERROR("Can't unpack %s\n", (char *)key);
-                        GOTO(out_req, rc = -EPROTO);
-                }
+        req_capsule_set_size(&req->rq_pill, &RMF_ACL, RCL_SERVER,
+                             sizeof(struct mdt_remote_perm));
 
-                *(struct lov_desc *)val = *reply;
-                RETURN(0);
-        } else if (keylen >= strlen("getext") && !strcmp(key, "getext")) {
-                struct fid_extent *reply;
-                
-                reply = lustre_swab_repbuf(req, 0, sizeof(*reply),
-                                           lustre_swab_fid_extent);
-                if (reply == NULL) {
-                        CERROR("Can't unpack %s\n", (char *)key);
-                        GOTO(out_req, rc = -EPROTO);
-                }
+        ptlrpc_request_set_replen(req);
 
-                *(struct fid_extent *)val = *reply;
-                RETURN(0);
-        } else {
-                __u32 *reply;
-                
-                reply = lustre_swab_repbuf(req, 0, sizeof(*reply),
-                                           lustre_swab_generic_32s);
-                if (reply == NULL) {
-                        CERROR("Can't unpack %s\n", (char *)key);
-                        GOTO(out_req, rc = -EPROTO);
-                }
-                *((__u32 *)val) = *reply;
-        }
-out_req:
-        ptlrpc_req_finished(req);
+        rc = ptlrpc_queue_wait(req);
+        if (rc)
+                ptlrpc_req_finished(req);
+        else
+                *request = req;
         RETURN(rc);
 }
 
-int mdc_obj_create(struct obd_export *exp, struct obdo *oa,
-                   void *acl, int acl_size, struct lov_stripe_md **ea,
-                   struct obd_trans_info *oti)
+static int mdc_interpret_renew_capa(const struct lu_env *env,
+                                    struct ptlrpc_request *req, void *unused,
+                                    int status)
 {
-        struct ptlrpc_request *request;
-        struct ost_body *body;
-        char *acl_buf;
-        int rc, size[2] = { sizeof(*body), acl_size };
+        struct obd_capa *oc = req->rq_async_args.pointer_arg[0];
+        renew_capa_cb_t cb = req->rq_async_args.pointer_arg[1];
+        struct mdt_body *body = NULL;
+        struct lustre_capa *capa;
         ENTRY;
 
-        LASSERT(oa);
+        if (status)
+                GOTO(out, capa = ERR_PTR(status));
 
-        request = ptlrpc_prep_req(class_exp2cliimp(exp), LUSTRE_OBD_VERSION,
-                                  OST_CREATE, 2, size, NULL);
-        if (!request)
-                GOTO(out_req, rc = -ENOMEM);
+        body = req_capsule_server_get(&req->rq_pill, &RMF_MDT_BODY);
+        if (body == NULL)
+                GOTO(out, capa = ERR_PTR(-EFAULT));
 
-        body = lustre_msg_buf(request->rq_reqmsg, 0, sizeof (*body));
-        memcpy(&body->oa, oa, sizeof(body->oa));
+        if ((body->valid & OBD_MD_FLOSSCAPA) == 0)
+                GOTO(out, capa = ERR_PTR(-ENOENT));
 
-        if (acl_size) {
-                acl_buf = lustre_msg_buf(request->rq_reqmsg, 1, acl_size);
-                memcpy(acl_buf, acl, acl_size);
-        }
-
-        request->rq_replen = lustre_msg_size(1, size);
-        rc = ptlrpc_queue_wait(request);
-        if (rc)
-                GOTO(out_req, rc);
-
-        body = lustre_swab_repbuf(request, 0, sizeof(*body),
-                                  lustre_swab_ost_body);
-        if (body == NULL) {
-                CERROR ("can't unpack ost_body\n");
-                GOTO (out_req, rc = -EPROTO);
-        }
-
-        memcpy(oa, &body->oa, sizeof(*oa));
-
-        /* store ino/generation for recovery */
-        body = lustre_msg_buf(request->rq_reqmsg, 0, sizeof (*body));
-        body->oa.o_id = oa->o_id;
-        body->oa.o_generation = oa->o_generation;
-        body->oa.o_fid = oa->o_fid;
-        body->oa.o_mds = oa->o_mds;
-
-        CDEBUG(D_HA, "transno: "LPD64"\n", request->rq_repmsg->transno);
+        capa = req_capsule_server_get(&req->rq_pill, &RMF_CAPA2);
+        if (!capa)
+                GOTO(out, capa = ERR_PTR(-EFAULT));
         EXIT;
-out_req:
-        ptlrpc_req_finished(request);
-        return rc;
+out:
+        cb(oc, capa);
+        return 0;
 }
 
-int mdc_brw(int rw, struct obd_export *exp, struct obdo *oa,
-            struct lov_stripe_md *ea, obd_count oa_bufs,
-            struct brw_page *pgarr, struct obd_trans_info *oti)
+static int mdc_renew_capa(struct obd_export *exp, struct obd_capa *oc,
+                          renew_capa_cb_t cb)
 {
-        struct ptlrpc_bulk_desc *desc;
-        struct niobuf_remote *niobuf;
         struct ptlrpc_request *req;
-        struct obd_ioobj *ioobj;
-        struct ost_body *body;
-        int err, opc, i;
-        int size[3];
-
-        opc = ((rw & OBD_BRW_WRITE) != 0) ? OST_WRITE : OST_READ;
-        
-        size[0] = sizeof(*body);
-        size[1] = sizeof(*ioobj);
-        size[2] = oa_bufs * sizeof(*niobuf);
-
-        req = ptlrpc_prep_req(class_exp2cliimp(exp), LUSTRE_OBD_VERSION, opc,
-                              3, size, NULL);
-        LASSERT(req != NULL);
-
-        if (opc == OST_WRITE)
-                desc = ptlrpc_prep_bulk_imp(req, oa_bufs, BULK_GET_SOURCE,
-                                            OST_BULK_PORTAL);
-        else
-                desc = ptlrpc_prep_bulk_imp(req, oa_bufs, BULK_PUT_SINK,
-                                            OST_BULK_PORTAL);
-        LASSERT(desc != NULL);
-
-        body = lustre_msg_buf(req->rq_reqmsg, 0, sizeof(*body));
-        ioobj = lustre_msg_buf(req->rq_reqmsg, 1, sizeof(*ioobj));
-        niobuf = lustre_msg_buf(req->rq_reqmsg, 2, oa_bufs * sizeof(*niobuf));
-
-        memcpy(&body->oa, oa, sizeof(*oa));
-        obdo_to_ioobj(oa, ioobj);
-        ioobj->ioo_bufcnt = oa_bufs;
-
-        for (i = 0; i < oa_bufs; i++, niobuf++) {
-                struct brw_page *pg = &pgarr[i];
-
-                LASSERT(pg->count > 0);
-                LASSERT((pg->disk_offset & ~PAGE_MASK) + pg->count <= PAGE_SIZE);
-
-                ptlrpc_prep_bulk_page(desc, pg->pg, pg->disk_offset & ~PAGE_MASK,
-                                      pg->count);
+        ENTRY;
 
-                niobuf->offset = pg->disk_offset;
-                niobuf->len = pg->count;
-                niobuf->flags = pg->flag;
-        }
+        req = ptlrpc_request_alloc_pack(class_exp2cliimp(exp), &RQF_MDS_GETATTR,
+                                        LUSTRE_MDS_VERSION, MDS_GETATTR);
+        if (req == NULL)
+                RETURN(-ENOMEM);
 
-        /* size[0] still sizeof (*body) */
-        if (opc == OST_WRITE) {
-                /* 1 RC per niobuf */
-                size[1] = sizeof(__u32) * oa_bufs;
-                req->rq_replen = lustre_msg_size(2, size);
-        } else {
-                /* 1 RC for the whole I/O */
-                req->rq_replen = lustre_msg_size(1, size);
-        }
-        err = ptlrpc_queue_wait(req);
-        LASSERT(err == 0);
+        /* NB, OBD_MD_FLOSSCAPA is set here, but it doesn't necessarily mean the
+         * capa to renew is oss capa.
+         */
+        mdc_pack_body(req, &oc->c_capa.lc_fid, oc, OBD_MD_FLOSSCAPA, 0, -1, 0);
+        ptlrpc_request_set_replen(req);
 
-        ptlrpc_req_finished(req);
-        return 0;
+        req->rq_async_args.pointer_arg[0] = oc;
+        req->rq_async_args.pointer_arg[1] = cb;
+        req->rq_interpret_reply = mdc_interpret_renew_capa;
+        ptlrpcd_add_req(req, PSCOPE_OTHER);
+        RETURN(0);
 }
 
-static int mdc_valid_attrs(struct obd_export *exp,
-                           struct lustre_id *id)
+static int mdc_connect(const struct lu_env *env,
+                       struct obd_export **exp,
+                       struct obd_device *obd, struct obd_uuid *cluuid,
+                       struct obd_connect_data *data,
+                       void *localdata)
 {
-        struct ldlm_res_id res_id = { .name = {0} };
-        struct obd_device *obd = exp->exp_obd;
-        struct lustre_handle lockh;
-        ldlm_policy_data_t policy;
-        int flags;
-        ENTRY;
-
-        res_id.name[0] = id_fid(id);
-        res_id.name[1] = id_group(id);
-        policy.l_inodebits.bits = MDS_INODELOCK_UPDATE;
-
-        CDEBUG(D_INFO, "trying to match res "LPU64"\n",
-               res_id.name[0]);
-
-        /* FIXME use LDLM_FL_TEST_LOCK instead */
-        flags = LDLM_FL_BLOCK_GRANTED | LDLM_FL_CBPENDING;
-        if (ldlm_lock_match(obd->obd_namespace, flags, &res_id,
-                            LDLM_IBITS, &policy, LCK_PR, &lockh)) {
-                ldlm_lock_decref(&lockh, LCK_PR);
-                RETURN(1);
-        }
+        struct obd_import *imp = obd->u.cli.cl_import;
 
-        if (ldlm_lock_match(obd->obd_namespace, flags, &res_id,
-                            LDLM_IBITS, &policy, LCK_PW, &lockh)) {
-                ldlm_lock_decref(&lockh, LCK_PW);
-                RETURN(1);
+        /* mds-mds import features */
+        if (data && (data->ocd_connect_flags & OBD_CONNECT_MDS_MDS)) {
+                cfs_spin_lock(&imp->imp_lock);
+                imp->imp_server_timeout = 1;
+                cfs_spin_unlock(&imp->imp_lock);
+                imp->imp_client->cli_request_portal = MDS_MDS_PORTAL;
+                CDEBUG(D_OTHER, "%s: Set 'mds' portal and timeout\n",
+                       obd->obd_name);
         }
-        RETURN(0);
-}
 
-static int mdc_change_cbdata_name(struct obd_export *exp,
-                                  struct lustre_id *pid,
-                                  char *name, int len,
-                                  struct lustre_id *cid,
-                                  ldlm_iterator_t it, void *data)
-{
-        int rc;
-        rc = mdc_change_cbdata(exp, cid, it, data);
-        RETURN(rc);
+        return client_connect_import(env, exp, obd, cluuid, data, NULL);
 }
 
 struct obd_ops mdc_obd_ops = {
-        .o_owner         = THIS_MODULE,
-        .o_attach        = mdc_attach,
-        .o_detach        = mdc_detach,
-        .o_setup         = mdc_setup,
-        .o_precleanup    = mdc_precleanup,
-        .o_cleanup       = mdc_cleanup,
-        .o_add_conn      = client_import_add_conn,
-        .o_del_conn      = client_import_del_conn,
-        .o_connect       = client_connect_import,
-        .o_disconnect    = client_disconnect_export,
-        .o_iocontrol     = mdc_iocontrol,
-        .o_packmd        = mdc_packmd,
-        .o_unpackmd      = mdc_unpackmd,
-        .o_statfs        = mdc_statfs,
-        .o_pin           = mdc_pin,
-        .o_unpin         = mdc_unpin,
-        .o_import_event  = mdc_import_event,
-        .o_llog_init     = mdc_llog_init,
-        .o_llog_finish   = mdc_llog_finish,
-        .o_create        = mdc_obj_create,
-        .o_set_info      = mdc_set_info,
-        .o_get_info      = mdc_get_info,
-        .o_brw           = mdc_brw,
-        .o_cancel_unused = mdc_cancel_unused,
-        .o_init_ea_size  = mdc_init_ea_size,
+        .o_owner            = THIS_MODULE,
+        .o_setup            = mdc_setup,
+        .o_precleanup       = mdc_precleanup,
+        .o_cleanup          = mdc_cleanup,
+        .o_add_conn         = client_import_add_conn,
+        .o_del_conn         = client_import_del_conn,
+        .o_connect          = mdc_connect,
+        .o_disconnect       = client_disconnect_export,
+        .o_iocontrol        = mdc_iocontrol,
+        .o_set_info_async   = mdc_set_info_async,
+        .o_statfs           = mdc_statfs,
+        .o_pin              = mdc_pin,
+        .o_unpin            = mdc_unpin,
+        .o_fid_init         = mdc_fid_init,
+        .o_fid_fini         = mdc_fid_fini,
+        .o_fid_alloc        = mdc_fid_alloc,
+        .o_fid_delete       = mdc_fid_delete,
+        .o_import_event     = mdc_import_event,
+        .o_llog_init        = mdc_llog_init,
+        .o_llog_finish      = mdc_llog_finish,
+        .o_get_info         = mdc_get_info,
+        .o_process_config   = mdc_process_config,
+        .o_get_uuid         = mdc_get_uuid,
 };
 
 struct md_ops mdc_md_ops = {
-        .m_getstatus     = mdc_getstatus,
-        .m_getattr       = mdc_getattr,
-        .m_close         = mdc_close,
-        .m_create        = mdc_create,
-        .m_done_writing  = mdc_done_writing,
-        .m_enqueue       = mdc_enqueue,
-        .m_getattr_lock  = mdc_getattr_lock,
-        .m_intent_lock   = mdc_intent_lock,
-        .m_link          = mdc_link,
-        .m_rename        = mdc_rename,
-        .m_setattr       = mdc_setattr,
-        .m_sync          = mdc_sync,
-        .m_readpage      = mdc_readpage,
-        .m_unlink        = mdc_unlink,
-        .m_valid_attrs   = mdc_valid_attrs,
-        .m_req2lustre_md = mdc_req2lustre_md,
-        .m_set_open_replay_data   = mdc_set_open_replay_data,
+        .m_getstatus        = mdc_getstatus,
+        .m_change_cbdata    = mdc_change_cbdata,
+        .m_close            = mdc_close,
+        .m_create           = mdc_create,
+        .m_done_writing     = mdc_done_writing,
+        .m_enqueue          = mdc_enqueue,
+        .m_getattr          = mdc_getattr,
+        .m_getattr_name     = mdc_getattr_name,
+        .m_intent_lock      = mdc_intent_lock,
+        .m_link             = mdc_link,
+        .m_is_subdir        = mdc_is_subdir,
+        .m_rename           = mdc_rename,
+        .m_setattr          = mdc_setattr,
+        .m_setxattr         = mdc_setxattr,
+        .m_getxattr         = mdc_getxattr,
+        .m_sync             = mdc_sync,
+        .m_readpage         = mdc_readpage,
+        .m_unlink           = mdc_unlink,
+        .m_cancel_unused    = mdc_cancel_unused,
+        .m_init_ea_size     = mdc_init_ea_size,
+        .m_set_lock_data    = mdc_set_lock_data,
+        .m_lock_match       = mdc_lock_match,
+        .m_get_lustre_md    = mdc_get_lustre_md,
+        .m_free_lustre_md   = mdc_free_lustre_md,
+        .m_set_open_replay_data = mdc_set_open_replay_data,
         .m_clear_open_replay_data = mdc_clear_open_replay_data,
-        .m_store_inode_generation = mdc_store_inode_generation,
-        .m_set_lock_data = mdc_set_lock_data,
-        .m_get_real_obd  = mdc_get_real_obd,
-        .m_change_cbdata_name = mdc_change_cbdata_name,
-        .m_change_cbdata = mdc_change_cbdata,
-        .m_access_check  = mdc_access_check,
+        .m_renew_capa       = mdc_renew_capa,
+        .m_unpack_capa      = mdc_unpack_capa,
+        .m_get_remote_perm  = mdc_get_remote_perm,
+        .m_intent_getattr_async = mdc_intent_getattr_async,
+        .m_revalidate_lock      = mdc_revalidate_lock
 };
 
 int __init mdc_init(void)
 {
-        struct lprocfs_static_vars lvars;
-        
-        lprocfs_init_vars(mdc, &lvars);
-        return class_register_type(&mdc_obd_ops, &mdc_md_ops,
-                                   lvars.module_vars, OBD_MDC_DEVICENAME);
+        int rc;
+        struct lprocfs_static_vars lvars = { 0 };
+        lprocfs_mdc_init_vars(&lvars);
+
+        cfs_request_module("lquota");
+        quota_interface = PORTAL_SYMBOL_GET(mdc_quota_interface);
+        init_obd_quota_ops(quota_interface, &mdc_obd_ops);
+
+        rc = class_register_type(&mdc_obd_ops, &mdc_md_ops, lvars.module_vars,
+                                 LUSTRE_MDC_NAME, NULL);
+        if (rc && quota_interface)
+                PORTAL_SYMBOL_PUT(mdc_quota_interface);
+
+        RETURN(rc);
 }
 
 #ifdef __KERNEL__
 static void /*__exit*/ mdc_exit(void)
 {
-        class_unregister_type(OBD_MDC_DEVICENAME);
+        if (quota_interface)
+                PORTAL_SYMBOL_PUT(mdc_quota_interface);
+
+        class_unregister_type(LUSTRE_MDC_NAME);
 }
 
-MODULE_AUTHOR("Cluster File Systems, Inc. <info@clusterfs.com>");
+MODULE_AUTHOR("Sun Microsystems, Inc. <http://www.lustre.org/>");
 MODULE_DESCRIPTION("Lustre Metadata Client");
 MODULE_LICENSE("GPL");
 
-EXPORT_SYMBOL(mdc_req2lustre_md);
-EXPORT_SYMBOL(mdc_change_cbdata);
-EXPORT_SYMBOL(mdc_getstatus);
-EXPORT_SYMBOL(mdc_getattr);
-EXPORT_SYMBOL(mdc_getattr_lock);
-EXPORT_SYMBOL(mdc_create);
-EXPORT_SYMBOL(mdc_unlink);
-EXPORT_SYMBOL(mdc_rename);
-EXPORT_SYMBOL(mdc_link);
-EXPORT_SYMBOL(mdc_readpage);
-EXPORT_SYMBOL(mdc_setattr);
-EXPORT_SYMBOL(mdc_close);
-EXPORT_SYMBOL(mdc_done_writing);
-EXPORT_SYMBOL(mdc_sync);
-EXPORT_SYMBOL(mdc_set_open_replay_data);
-EXPORT_SYMBOL(mdc_clear_open_replay_data);
-EXPORT_SYMBOL(mdc_store_inode_generation);
-
 module_init(mdc_init);
 module_exit(mdc_exit);
 #endif