Whamcloud - gitweb
LU-11868 mdc: Improve xattr buffer allocations
[fs/lustre-release.git] / lustre / mdc / mdc_request.c
index 390068d..4941f06 100644 (file)
@@ -23,7 +23,7 @@
  * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2011, 2016, Intel Corporation.
+ * Copyright (c) 2011, 2017, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
 # include <linux/uidgid.h>
 #endif
 
-#include <lustre/lustre_errno.h>
+#include <lustre_errno.h>
 
 #include <cl_object.h>
 #include <llog_swab.h>
 #include <lprocfs_status.h>
 #include <lustre_acl.h>
 #include <lustre_fid.h>
-#include <uapi/linux/lustre_ioctl.h>
+#include <uapi/linux/lustre/lustre_ioctl.h>
 #include <lustre_kernelcomm.h>
 #include <lustre_lmv.h>
 #include <lustre_log.h>
-#include <lustre_param.h>
+#include <uapi/linux/lustre/lustre_param.h>
 #include <lustre_swab.h>
 #include <obd_class.h>
+#include <lustre_osc.h>
 
 #include "mdc_internal.h"
 
@@ -191,20 +192,34 @@ static int mdc_getattr_common(struct obd_export *exp,
         RETURN(0);
 }
 
+static void mdc_reset_acl_req(struct ptlrpc_request *req)
+{
+       spin_lock(&req->rq_early_free_lock);
+       sptlrpc_cli_free_repbuf(req);
+       req->rq_repbuf = NULL;
+       req->rq_repbuf_len = 0;
+       req->rq_repdata = NULL;
+       req->rq_reqdata_len = 0;
+       spin_unlock(&req->rq_early_free_lock);
+}
+
 static int mdc_getattr(struct obd_export *exp, struct md_op_data *op_data,
                       struct ptlrpc_request **request)
 {
-        struct ptlrpc_request *req;
-        int                    rc;
-        ENTRY;
+       struct ptlrpc_request *req;
+       struct obd_import *imp = class_exp2cliimp(exp);
+       __u32 acl_bufsize = LUSTRE_POSIX_ACL_MAX_SIZE_OLD;
+       int rc;
+       ENTRY;
 
        /* Single MDS without an LMV case */
        if (op_data->op_flags & MF_GET_MDT_IDX) {
                op_data->op_mds = 0;
                RETURN(0);
        }
-        *request = NULL;
-        req = ptlrpc_request_alloc(class_exp2cliimp(exp), &RQF_MDS_GETATTR);
+
+       *request = NULL;
+       req = ptlrpc_request_alloc(imp, &RQF_MDS_GETATTR);
         if (req == NULL)
                 RETURN(-ENOMEM);
 
@@ -214,31 +229,42 @@ static int mdc_getattr(struct obd_export *exp, struct md_op_data *op_data,
                 RETURN(rc);
         }
 
+again:
        mdc_pack_body(req, &op_data->op_fid1, op_data->op_valid,
                      op_data->op_mode, -1, 0);
+       req_capsule_set_size(&req->rq_pill, &RMF_ACL, RCL_SERVER, acl_bufsize);
+       req_capsule_set_size(&req->rq_pill, &RMF_MDT_MD, RCL_SERVER,
+                            op_data->op_mode);
+       ptlrpc_request_set_replen(req);
 
-        req_capsule_set_size(&req->rq_pill, &RMF_MDT_MD, RCL_SERVER,
-                             op_data->op_mode);
-        ptlrpc_request_set_replen(req);
+       rc = mdc_getattr_common(exp, req);
+       if (rc) {
+               if (rc == -ERANGE) {
+                       acl_bufsize = MIN(imp->imp_connect_data.ocd_max_easize,
+                                         XATTR_SIZE_MAX);
+                       mdc_reset_acl_req(req);
+                       goto again;
+               }
 
-        rc = mdc_getattr_common(exp, req);
-        if (rc)
-                ptlrpc_req_finished(req);
-        else
-                *request = req;
-        RETURN(rc);
+               ptlrpc_req_finished(req);
+       } else {
+               *request = req;
+       }
+
+       RETURN(rc);
 }
 
 static int mdc_getattr_name(struct obd_export *exp, struct md_op_data *op_data,
                            struct ptlrpc_request **request)
 {
-        struct ptlrpc_request *req;
-        int                    rc;
-        ENTRY;
+       struct ptlrpc_request *req;
+       struct obd_import *imp = class_exp2cliimp(exp);
+       __u32 acl_bufsize = LUSTRE_POSIX_ACL_MAX_SIZE_OLD;
+       int rc;
+       ENTRY;
 
-        *request = NULL;
-        req = ptlrpc_request_alloc(class_exp2cliimp(exp),
-                                   &RQF_MDS_GETATTR_NAME);
+       *request = NULL;
+       req = ptlrpc_request_alloc(imp, &RQF_MDS_GETATTR_NAME);
         if (req == NULL)
                 RETURN(-ENOMEM);
 
@@ -251,9 +277,6 @@ static int mdc_getattr_name(struct obd_export *exp, struct md_op_data *op_data,
                 RETURN(rc);
         }
 
-       mdc_pack_body(req, &op_data->op_fid1, op_data->op_valid,
-                     op_data->op_mode, op_data->op_suppgids[0], 0);
-
         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) ==
@@ -261,16 +284,29 @@ static int mdc_getattr_name(struct obd_export *exp, struct md_op_data *op_data,
                 memcpy(name, op_data->op_name, op_data->op_namelen);
         }
 
-        req_capsule_set_size(&req->rq_pill, &RMF_MDT_MD, RCL_SERVER,
-                             op_data->op_mode);
-        ptlrpc_request_set_replen(req);
+again:
+       mdc_pack_body(req, &op_data->op_fid1, op_data->op_valid,
+                     op_data->op_mode, op_data->op_suppgids[0], 0);
+       req_capsule_set_size(&req->rq_pill, &RMF_MDT_MD, RCL_SERVER,
+                            op_data->op_mode);
+       req_capsule_set_size(&req->rq_pill, &RMF_ACL, RCL_SERVER, acl_bufsize);
+       ptlrpc_request_set_replen(req);
 
-        rc = mdc_getattr_common(exp, req);
-        if (rc)
-                ptlrpc_req_finished(req);
-        else
-                *request = req;
-        RETURN(rc);
+       rc = mdc_getattr_common(exp, req);
+       if (rc) {
+               if (rc == -ERANGE) {
+                       acl_bufsize = MIN(imp->imp_connect_data.ocd_max_easize,
+                                         XATTR_SIZE_MAX);
+                       mdc_reset_acl_req(req);
+                       goto again;
+               }
+
+               ptlrpc_req_finished(req);
+       } else {
+               *request = req;
+       }
+
+       RETURN(rc);
 }
 
 static int mdc_xattr_common(struct obd_export *exp,const struct req_format *fmt,
@@ -329,11 +365,11 @@ static int mdc_xattr_common(struct obd_export *exp,const struct req_format *fmt,
                }
        }
 
-        if (opcode == MDS_REINT) {
-                struct mdt_rec_setxattr *rec;
+       if (opcode == MDS_REINT) {
+               struct mdt_rec_setxattr *rec;
 
-                CLASSERT(sizeof(struct mdt_rec_setxattr) ==
-                         sizeof(struct mdt_rec_reint));
+               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;
                rec->sx_fsuid  = from_kuid(&init_user_ns, current_fsuid());
@@ -381,26 +417,75 @@ static int mdc_xattr_common(struct obd_export *exp,const struct req_format *fmt,
 }
 
 static int mdc_setxattr(struct obd_export *exp, const struct lu_fid *fid,
-                       u64 valid, const char *xattr_name,
-                       const char *input, int input_size, int output_size,
-                       int flags, __u32 suppgid,
-                       struct ptlrpc_request **request)
+                       u64 obd_md_valid, const char *name,
+                       const void *value, size_t value_size,
+                       unsigned int xattr_flags, u32 suppgid,
+                       struct ptlrpc_request **req)
 {
+       LASSERT(obd_md_valid == OBD_MD_FLXATTR ||
+               obd_md_valid == OBD_MD_FLXATTRRM);
+
        return mdc_xattr_common(exp, &RQF_MDS_REINT_SETXATTR,
-                               fid, MDS_REINT, valid, xattr_name,
-                               input, input_size, output_size, flags,
-                               suppgid, request);
+                               fid, MDS_REINT, obd_md_valid, name,
+                               value, value_size, 0, xattr_flags, suppgid,
+                               req);
 }
 
 static int mdc_getxattr(struct obd_export *exp, const struct lu_fid *fid,
-                       u64 valid, const char *xattr_name,
-                       const char *input, int input_size, int output_size,
-                       int flags, struct ptlrpc_request **request)
+                       u64 obd_md_valid, const char *name, size_t buf_size,
+                       struct ptlrpc_request **req)
 {
-       return mdc_xattr_common(exp, &RQF_MDS_GETXATTR,
-                               fid, MDS_GETXATTR, valid, xattr_name,
-                               input, input_size, output_size, flags,
-                               -1, request);
+       struct mdt_body *body;
+       int rc;
+
+       LASSERT(obd_md_valid == OBD_MD_FLXATTR ||
+               obd_md_valid == OBD_MD_FLXATTRLS);
+
+       rc = mdc_xattr_common(exp, &RQF_MDS_GETXATTR, fid, MDS_GETXATTR,
+                             obd_md_valid, name, NULL, 0, buf_size, 0, -1,
+                             req);
+       if (rc < 0)
+               GOTO(out, rc);
+
+       body = req_capsule_server_get(&(*req)->rq_pill, &RMF_MDT_BODY);
+       if (body == NULL)
+               GOTO(out, rc = -EPROTO);
+
+       /* only detect the xattr size */
+       if (buf_size == 0) {
+               /* LU-11109: Older MDTs do not distinguish
+                * between nonexistent xattrs and zero length
+                * values in this case. Newer MDTs will return
+                * -ENODATA or set OBD_MD_FLXATTR. */
+               GOTO(out, rc = body->mbo_eadatasize);
+       }
+
+       if (body->mbo_eadatasize == 0) {
+               /* LU-11109: Newer MDTs set OBD_MD_FLXATTR on
+                * success so that we can distinguish between
+                * zero length value and nonexistent xattr.
+                *
+                * If OBD_MD_FLXATTR is not set then we keep
+                * the old behavior and return -ENODATA for
+                * getxattr() when mbo_eadatasize is 0. But
+                * -ENODATA only makes sense for getxattr()
+                * and not for listxattr(). */
+               if (body->mbo_valid & OBD_MD_FLXATTR)
+                       GOTO(out, rc = 0);
+               else if (obd_md_valid == OBD_MD_FLXATTR)
+                       GOTO(out, rc = -ENODATA);
+               else
+                       GOTO(out, rc = 0);
+       }
+
+       GOTO(out, rc = body->mbo_eadatasize);
+out:
+       if (rc < 0) {
+               ptlrpc_req_finished(*req);
+               *req = NULL;
+       }
+
+       return rc;
 }
 
 #ifdef CONFIG_FS_POSIX_ACL
@@ -548,50 +633,59 @@ int mdc_free_lustre_md(struct obd_export *exp, struct lustre_md *md)
 
 void mdc_replay_open(struct ptlrpc_request *req)
 {
-        struct md_open_data *mod = req->rq_cb_data;
-        struct ptlrpc_request *close_req;
-        struct obd_client_handle *och;
-        struct lustre_handle old;
-        struct mdt_body *body;
-        ENTRY;
+       struct md_open_data *mod = req->rq_cb_data;
+       struct ptlrpc_request *close_req;
+       struct obd_client_handle *och;
+       struct lustre_handle old_open_handle = { };
+       struct mdt_body *body;
+       ENTRY;
 
-        if (mod == NULL) {
-                DEBUG_REQ(D_ERROR, req,
-                          "Can't properly replay without open data.");
-                EXIT;
-                return;
-        }
+       if (mod == NULL) {
+               DEBUG_REQ(D_ERROR, req,
+                         "Can't properly replay without open data.");
+               EXIT;
+               return;
+       }
 
-        body = req_capsule_server_get(&req->rq_pill, &RMF_MDT_BODY);
-        LASSERT(body != NULL);
+       body = req_capsule_server_get(&req->rq_pill, &RMF_MDT_BODY);
+       LASSERT(body != NULL);
+
+       spin_lock(&req->rq_lock);
+       och = mod->mod_och;
+       if (och && och->och_open_handle.cookie)
+               req->rq_early_free_repbuf = 1;
+       else
+               req->rq_early_free_repbuf = 0;
+       spin_unlock(&req->rq_lock);
 
-        och = mod->mod_och;
-        if (och != NULL) {
-                struct lustre_handle *file_fh;
+       if (req->rq_early_free_repbuf) {
+               struct lustre_handle *file_open_handle;
 
-                LASSERT(och->och_magic == OBD_CLIENT_HANDLE_MAGIC);
+               LASSERT(och->och_magic == OBD_CLIENT_HANDLE_MAGIC);
 
-                file_fh = &och->och_fh;
+               file_open_handle = &och->och_open_handle;
                CDEBUG(D_HA, "updating handle from %#llx to %#llx\n",
-                      file_fh->cookie, body->mbo_handle.cookie);
-               old = *file_fh;
-               *file_fh = body->mbo_handle;
-        }
-        close_req = mod->mod_close_req;
-        if (close_req != NULL) {
-                __u32 opc = lustre_msg_get_opc(close_req->rq_reqmsg);
-                struct mdt_ioepoch *epoch;
+                      file_open_handle->cookie, body->mbo_open_handle.cookie);
+               old_open_handle = *file_open_handle;
+               *file_open_handle = body->mbo_open_handle;
+       }
+
+       close_req = mod->mod_close_req;
+       if (close_req) {
+               __u32 opc = lustre_msg_get_opc(close_req->rq_reqmsg);
+               struct mdt_ioepoch *epoch;
 
                LASSERT(opc == MDS_CLOSE);
                epoch = req_capsule_client_get(&close_req->rq_pill,
                                               &RMF_MDT_EPOCH);
                LASSERT(epoch);
 
-               if (och != NULL)
-                       LASSERT(!memcmp(&old, &epoch->mio_handle, sizeof(old)));
+               if (req->rq_early_free_repbuf)
+                       LASSERT(old_open_handle.cookie ==
+                               epoch->mio_open_handle.cookie);
 
                DEBUG_REQ(D_HA, close_req, "updating close body with new fh");
-               epoch->mio_handle = body->mbo_handle;
+               epoch->mio_open_handle = body->mbo_open_handle;
        }
        EXIT;
 }
@@ -671,21 +765,22 @@ int mdc_set_open_replay_data(struct obd_export *exp,
                mod->mod_open_req = open_req;
                open_req->rq_cb_data = mod;
                open_req->rq_commit_cb = mdc_commit_open;
+               open_req->rq_early_free_repbuf = 1;
                spin_unlock(&open_req->rq_lock);
-        }
+       }
 
        rec->cr_fid2 = body->mbo_fid1;
-       rec->cr_ioepoch = body->mbo_ioepoch;
-       rec->cr_old_handle.cookie = body->mbo_handle.cookie;
+       rec->cr_open_handle_old = body->mbo_open_handle;
        open_req->rq_replay_cb = mdc_replay_open;
        if (!fid_is_sane(&body->mbo_fid1)) {
-                DEBUG_REQ(D_ERROR, open_req, "Saving replay request with "
-                          "insane fid");
-                LBUG();
-        }
+               DEBUG_REQ(D_ERROR, open_req,
+                         "saving replay request with insane FID " DFID,
+                         PFID(&body->mbo_fid1));
+               LBUG();
+       }
 
-        DEBUG_REQ(D_RPCTRACE, open_req, "Set up open replay data");
-        RETURN(0);
+       DEBUG_REQ(D_RPCTRACE, open_req, "Set up open replay data");
+       RETURN(0);
 }
 
 static void mdc_free_open(struct md_open_data *mod)
@@ -724,8 +819,14 @@ int mdc_clear_open_replay_data(struct obd_export *exp,
         if (mod == NULL)
                 RETURN(0);
 
-        LASSERT(mod != LP_POISON);
+       LASSERT(mod != LP_POISON);
        LASSERT(mod->mod_open_req != NULL);
+
+       spin_lock(&mod->mod_open_req->rq_lock);
+       if (mod->mod_och)
+               mod->mod_och->och_open_handle.cookie = 0;
+       mod->mod_open_req->rq_early_free_repbuf = 0;
+       spin_unlock(&mod->mod_open_req->rq_lock);
        mdc_free_open(mod);
 
         mod->mod_och = NULL;
@@ -741,23 +842,35 @@ static int mdc_close(struct obd_export *exp, struct md_op_data *op_data,
        struct obd_device     *obd = class_exp2obd(exp);
        struct ptlrpc_request *req;
        struct req_format     *req_fmt;
+       size_t                 u32_count = 0;
        int                    rc;
        int                    saved_rc = 0;
        ENTRY;
 
-       if (op_data->op_bias & MDS_HSM_RELEASE) {
-               req_fmt = &RQF_MDS_INTENT_CLOSE;
+       CDEBUG(D_INODE, "%s: "DFID" file closed with intent: %x\n",
+              exp->exp_obd->obd_name, PFID(&op_data->op_fid1),
+              op_data->op_bias);
+
+       if (op_data->op_bias & MDS_CLOSE_INTENT) {
+               req_fmt = &RQF_MDS_CLOSE_INTENT;
+               if (op_data->op_bias & MDS_HSM_RELEASE) {
+                       /* allocate a FID for volatile file */
+                       rc = mdc_fid_alloc(NULL, exp, &op_data->op_fid2,
+                                          op_data);
+                       if (rc < 0) {
+                               CERROR("%s: "DFID" allocating FID: rc = %d\n",
+                                      obd->obd_name, PFID(&op_data->op_fid1),
+                                      rc);
+                               /* save the errcode and proceed to close */
+                               saved_rc = rc;
+                       }
+               }
+               if (op_data->op_bias & MDS_CLOSE_RESYNC_DONE) {
+                       size_t count = op_data->op_data_size / sizeof(__u32);
 
-               /* allocate a FID for volatile file */
-               rc = mdc_fid_alloc(NULL, exp, &op_data->op_fid2, op_data);
-               if (rc < 0) {
-                       CERROR("%s: "DFID" failed to allocate FID: %d\n",
-                              obd->obd_name, PFID(&op_data->op_fid1), rc);
-                       /* save the errcode and proceed to close */
-                       saved_rc = rc;
+                       if (count > INLINE_RESYNC_ARRAY_SIZE)
+                               u32_count = count;
                }
-       } else if (op_data->op_bias & MDS_CLOSE_LAYOUT_SWAP) {
-               req_fmt = &RQF_MDS_INTENT_CLOSE;
        } else {
                req_fmt = &RQF_MDS_CLOSE;
        }
@@ -795,6 +908,10 @@ static int mdc_close(struct obd_export *exp, struct md_op_data *op_data,
                GOTO(out, rc = -ENOMEM);
        }
 
+       if (u32_count > 0)
+               req_capsule_set_size(&req->rq_pill, &RMF_U32, RCL_CLIENT,
+                                    u32_count * sizeof(__u32));
+
        rc = ptlrpc_request_pack(req, LUSTRE_MDS_VERSION, MDS_CLOSE);
        if (rc) {
                ptlrpc_request_free(req);
@@ -1196,7 +1313,8 @@ static int mdc_read_page_remote(void *data, struct page *page0)
        }
 
        for (npages = 1; npages < max_pages; npages++) {
-               page = page_cache_alloc_cold(inode->i_mapping);
+               page = __page_cache_alloc(mapping_gfp_mask(inode->i_mapping)
+                                         | __GFP_COLD);
                if (page == NULL)
                        break;
                page_pool[npages] = page;
@@ -1409,33 +1527,48 @@ fail:
        goto out_unlock;
 }
 
-
 static int mdc_statfs(const struct lu_env *env,
                       struct obd_export *exp, struct obd_statfs *osfs,
-                      __u64 max_age, __u32 flags)
+                     time64_t max_age, __u32 flags)
 {
-        struct obd_device     *obd = class_exp2obd(exp);
-        struct ptlrpc_request *req;
-        struct obd_statfs     *msfs;
-        struct obd_import     *imp = NULL;
-        int                    rc;
-        ENTRY;
+       struct obd_device *obd = class_exp2obd(exp);
+       struct req_format *fmt;
+       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
          */
        down_read(&obd->u.cli.cl_sem);
-        if (obd->u.cli.cl_import)
-                imp = class_import_get(obd->u.cli.cl_import);
+       if (obd->u.cli.cl_import)
+               imp = class_import_get(obd->u.cli.cl_import);
        up_read(&obd->u.cli.cl_sem);
-        if (!imp)
-                RETURN(-ENODEV);
+       if (!imp)
+               RETURN(-ENODEV);
+
+       fmt = &RQF_MDS_STATFS;
+       if ((exp_connect_flags2(exp) & OBD_CONNECT2_SUM_STATFS) &&
+           (flags & OBD_STATFS_SUM))
+               fmt = &RQF_MDS_STATFS_NEW;
+       req = ptlrpc_request_alloc_pack(imp, fmt, LUSTRE_MDS_VERSION,
+                                       MDS_STATFS);
+       if (req == NULL)
+               GOTO(output, rc = -ENOMEM);
 
-        req = ptlrpc_request_alloc_pack(imp, &RQF_MDS_STATFS,
-                                        LUSTRE_MDS_VERSION, MDS_STATFS);
-        if (req == NULL)
-                GOTO(output, rc = -ENOMEM);
+       if ((flags & OBD_STATFS_SUM) &&
+           (exp_connect_flags2(exp) & OBD_CONNECT2_SUM_STATFS)) {
+               /* request aggregated states */
+               struct mdt_body *body;
+
+               body = req_capsule_client_get(&req->rq_pill, &RMF_MDT_BODY);
+               if (body == NULL)
+                       GOTO(out, rc = -EPROTO);
+               body->mbo_valid = OBD_MD_FLAGSTATFS;
+       }
 
         ptlrpc_request_set_replen(req);
 
@@ -1551,29 +1684,53 @@ out:
        ptlrpc_req_finished(req);
        return rc;
 }
-
-static int mdc_ioc_hsm_ct_register(struct obd_import *imp, __u32 archives)
+/**
+ * Send hsm_ct_register to MDS
+ *
+ * \param[in]  imp             import
+ * \param[in]  archive_count   if in bitmap format, it is the bitmap,
+ *                             else it is the count of archive_ids
+ * \param[in]  archives        if in bitmap format, it is NULL,
+ *                             else it is archive_id lists
+ */
+static int mdc_ioc_hsm_ct_register(struct obd_import *imp, __u32 archive_count,
+                                  __u32 *archives)
 {
-       __u32                   *archive_mask;
-       struct ptlrpc_request   *req;
-       int                      rc;
+       struct ptlrpc_request *req;
+       __u32 *archive_array;
+       size_t archives_size;
+       int rc;
        ENTRY;
 
-       req = ptlrpc_request_alloc_pack(imp, &RQF_MDS_HSM_CT_REGISTER,
-                                       LUSTRE_MDS_VERSION,
-                                       MDS_HSM_CT_REGISTER);
+       req = ptlrpc_request_alloc(imp, &RQF_MDS_HSM_CT_REGISTER);
        if (req == NULL)
-               GOTO(out, rc = -ENOMEM);
+               RETURN(-ENOMEM);
+
+       if (archives != NULL)
+               archives_size = sizeof(*archive_array) * archive_count;
+       else
+               archives_size = sizeof(archive_count);
+
+       req_capsule_set_size(&req->rq_pill, &RMF_MDS_HSM_ARCHIVE,
+                            RCL_CLIENT, archives_size);
+
+       rc = ptlrpc_request_pack(req, LUSTRE_MDS_VERSION, MDS_HSM_CT_REGISTER);
+       if (rc) {
+               ptlrpc_request_free(req);
+               RETURN(-ENOMEM);
+       }
 
        mdc_pack_body(req, NULL, 0, 0, -1, 0);
 
-       /* Copy hsm_progress struct */
-       archive_mask = req_capsule_client_get(&req->rq_pill,
-                                             &RMF_MDS_HSM_ARCHIVE);
-       if (archive_mask == NULL)
+       archive_array = req_capsule_client_get(&req->rq_pill,
+                                              &RMF_MDS_HSM_ARCHIVE);
+       if (archive_array == NULL)
                GOTO(out, rc = -EPROTO);
 
-       *archive_mask = archives;
+       if (archives != NULL)
+               memcpy(archive_array, archives, archives_size);
+       else
+               *archive_array = archive_count;
 
        ptlrpc_request_set_replen(req);
 
@@ -1798,38 +1955,37 @@ static int mdc_ioc_hsm_ct_start(struct obd_export *exp,
 static int mdc_quotactl(struct obd_device *unused, struct obd_export *exp,
                         struct obd_quotactl *oqctl)
 {
-        struct ptlrpc_request   *req;
-        struct obd_quotactl     *oqc;
-        int                      rc;
-        ENTRY;
+       struct ptlrpc_request   *req;
+       struct obd_quotactl     *oqc;
+       int                      rc;
+       ENTRY;
 
-        req = ptlrpc_request_alloc_pack(class_exp2cliimp(exp),
-                                        &RQF_MDS_QUOTACTL, LUSTRE_MDS_VERSION,
-                                        MDS_QUOTACTL);
-        if (req == NULL)
-                RETURN(-ENOMEM);
+       req = ptlrpc_request_alloc_pack(class_exp2cliimp(exp),
+                                       &RQF_MDS_QUOTACTL, LUSTRE_MDS_VERSION,
+                                       MDS_QUOTACTL);
+       if (req == NULL)
+               RETURN(-ENOMEM);
 
-        oqc = req_capsule_client_get(&req->rq_pill, &RMF_OBD_QUOTACTL);
-        *oqc = *oqctl;
+       oqc = req_capsule_client_get(&req->rq_pill, &RMF_OBD_QUOTACTL);
+       *oqc = *oqctl;
 
-        ptlrpc_request_set_replen(req);
-        ptlrpc_at_set_req_timeout(req);
-        req->rq_no_resend = 1;
+       ptlrpc_request_set_replen(req);
+       ptlrpc_at_set_req_timeout(req);
 
-        rc = ptlrpc_queue_wait(req);
-        if (rc)
-                CERROR("ptlrpc_queue_wait failed, rc: %d\n", rc);
-
-        if (req->rq_repmsg &&
-            (oqc = req_capsule_server_get(&req->rq_pill, &RMF_OBD_QUOTACTL))) {
-                *oqctl = *oqc;
-        } else if (!rc) {
-                CERROR ("Can't unpack obd_quotactl\n");
-                rc = -EPROTO;
-        }
-        ptlrpc_req_finished(req);
+       rc = ptlrpc_queue_wait(req);
+       if (rc)
+               CERROR("ptlrpc_queue_wait failed, rc: %d\n", rc);
+
+       if (req->rq_repmsg &&
+           (oqc = req_capsule_server_get(&req->rq_pill, &RMF_OBD_QUOTACTL))) {
+               *oqctl = *oqc;
+       } else if (!rc) {
+               CERROR ("Can't unpack obd_quotactl\n");
+               rc = -EPROTO;
+       }
+       ptlrpc_req_finished(req);
 
-        RETURN(rc);
+       RETURN(rc);
 }
 
 static int mdc_ioc_swap_layouts(struct obd_export *exp,
@@ -1958,7 +2114,7 @@ static int mdc_iocontrol(unsigned int cmd, struct obd_export *exp, int len,
                        GOTO(out, rc = -EFAULT);
 
                rc = mdc_statfs(NULL, obd->obd_self_export, &stat_buf,
-                               cfs_time_shift_64(-OBD_STATFS_CACHE_SECONDS),
+                               ktime_get_seconds() - OBD_STATFS_CACHE_SECONDS,
                                0);
                if (rc != 0)
                        GOTO(out, rc);
@@ -2095,9 +2251,8 @@ static void lustre_swab_kuch(struct kuc_hdr *l)
 static int mdc_ioc_hsm_ct_start(struct obd_export *exp,
                                struct lustre_kernelcomm *lk)
 {
-       struct obd_import  *imp = class_exp2cliimp(exp);
-       __u32               archive = lk->lk_data;
-       int                 rc = 0;
+       struct obd_import *imp = class_exp2cliimp(exp);
+       int rc = 0;
 
        if (lk->lk_group != KUC_GRP_HSM) {
                CERROR("Bad copytool group %d\n", lk->lk_group);
@@ -2111,7 +2266,12 @@ static int mdc_ioc_hsm_ct_start(struct obd_export *exp,
                /* Unregister with the coordinator */
                rc = mdc_ioc_hsm_ct_unregister(imp);
        } else {
-               rc = mdc_ioc_hsm_ct_register(imp, archive);
+               __u32 *archives = NULL;
+
+               if ((lk->lk_flags & LK_FLG_DATANR) && lk->lk_data_count > 0)
+                       archives = lk->lk_data;
+
+               rc = mdc_ioc_hsm_ct_register(imp, lk->lk_data_count, archives);
        }
 
        return rc;
@@ -2122,7 +2282,8 @@ static int mdc_ioc_hsm_ct_start(struct obd_export *exp,
  * @param val KUC message (kuc_hdr + hsm_action_list)
  * @param len total length of message
  */
-static int mdc_hsm_copytool_send(size_t len, void *val)
+static int mdc_hsm_copytool_send(const struct obd_uuid *uuid,
+                                size_t len, void *val)
 {
        struct kuc_hdr          *lh = (struct kuc_hdr *)val;
        struct hsm_action_list  *hal = (struct hsm_action_list *)(lh + 1);
@@ -2148,7 +2309,7 @@ static int mdc_hsm_copytool_send(size_t len, void *val)
               lh->kuc_msglen, hal->hal_count, hal->hal_fsname);
 
        /* Broadcast to HSM listeners */
-       rc = libcfs_kkuc_group_put(KUC_GRP_HSM, lh);
+       rc = libcfs_kkuc_group_put(uuid, KUC_GRP_HSM, lh);
 
        RETURN(rc);
 }
@@ -2161,20 +2322,29 @@ static int mdc_hsm_copytool_send(size_t len, void *val)
  */
 static int mdc_hsm_ct_reregister(void *data, void *cb_arg)
 {
-       struct kkuc_ct_data     *kcd = data;
-       struct obd_import       *imp = (struct obd_import *)cb_arg;
-       int                      rc;
+       struct obd_import *imp = (struct obd_import *)cb_arg;
+       struct kkuc_ct_data *kcd = data;
+       __u32 *archives = NULL;
+       int rc;
 
-       if (kcd == NULL || kcd->kcd_magic != KKUC_CT_DATA_MAGIC)
+       if (kcd == NULL ||
+           (kcd->kcd_magic != KKUC_CT_DATA_ARRAY_MAGIC &&
+            kcd->kcd_magic != KKUC_CT_DATA_BITMAP_MAGIC))
                return -EPROTO;
 
-       if (!obd_uuid_equals(&kcd->kcd_uuid, &imp->imp_obd->obd_uuid))
-               return 0;
-
-       CDEBUG(D_HA, "%s: recover copytool registration to MDT (archive=%#x)\n",
-              imp->imp_obd->obd_name, kcd->kcd_archive);
-       rc = mdc_ioc_hsm_ct_register(imp, kcd->kcd_archive);
+       if (kcd->kcd_magic == KKUC_CT_DATA_BITMAP_MAGIC) {
+               CDEBUG(D_HA, "%s: recover copytool registration to MDT "
+                      "(archive=%#x)\n", imp->imp_obd->obd_name,
+                      kcd->kcd_nr_archives);
+       } else {
+               CDEBUG(D_HA, "%s: recover copytool registration to MDT "
+                      "(archive nr = %u)\n",
+                      imp->imp_obd->obd_name, kcd->kcd_nr_archives);
+               if (kcd->kcd_nr_archives != 0)
+                       archives = kcd->kcd_archives;
+       }
 
+       rc = mdc_ioc_hsm_ct_register(imp, kcd->kcd_nr_archives, archives);
        /* ignore error if the copytool is already registered */
        return (rc == -EEXIST) ? 0 : rc;
 }
@@ -2186,8 +2356,8 @@ static int mdc_hsm_ct_reregister(void *data, void *cb_arg)
 static int mdc_kuc_reregister(struct obd_import *imp)
 {
        /* re-register HSM agents */
-       return libcfs_kkuc_group_foreach(KUC_GRP_HSM, mdc_hsm_ct_reregister,
-                                        (void *)imp);
+       return libcfs_kkuc_group_foreach(&imp->imp_obd->obd_uuid, KUC_GRP_HSM,
+                                        mdc_hsm_ct_reregister, imp);
 }
 
 static int mdc_set_info_async(const struct lu_env *env,
@@ -2220,21 +2390,14 @@ static int mdc_set_info_async(const struct lu_env *env,
                                        keylen, key, vallen, val, set);
                 RETURN(rc);
         }
-        if (KEY_IS(KEY_SPTLRPC_CONF)) {
-                sptlrpc_conf_client_adapt(exp->exp_obd);
-                RETURN(0);
-        }
-        if (KEY_IS(KEY_FLUSH_CTX)) {
-                sptlrpc_import_flush_my_ctx(imp);
-                RETURN(0);
-        }
         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);
         }
         if (KEY_IS(KEY_HSM_COPYTOOL_SEND)) {
-                rc = mdc_hsm_copytool_send(vallen, val);
+               rc = mdc_hsm_copytool_send(&imp->imp_obd->obd_uuid, vallen,
+                                          val);
                 RETURN(rc);
         }
 
@@ -2245,8 +2408,8 @@ static int mdc_set_info_async(const struct lu_env *env,
                RETURN(0);
        }
 
-       CERROR("Unknown key %s\n", (char *)key);
-       RETURN(-EINVAL);
+       rc = osc_set_info_async(env, exp, keylen, key, vallen, val, set);
+       RETURN(rc);
 }
 
 static int mdc_get_info(const struct lu_env *env, struct obd_export *exp,
@@ -2325,14 +2488,19 @@ static int mdc_fsync(struct obd_export *exp, const struct lu_fid *fid,
 static int mdc_import_event(struct obd_device *obd, struct obd_import *imp,
                            enum obd_import_event event)
 {
+       struct client_obd *cli = &obd->u.cli;
        int rc = 0;
 
        LASSERT(imp->imp_obd == obd);
 
        switch (event) {
-
-       case IMP_EVENT_INACTIVE: {
-               struct client_obd *cli = &obd->u.cli;
+       case IMP_EVENT_DISCON:
+               spin_lock(&cli->cl_loi_list_lock);
+               cli->cl_avail_grant = 0;
+               cli->cl_lost_grant = 0;
+               spin_unlock(&cli->cl_loi_list_lock);
+               break;
+       case IMP_EVENT_INACTIVE:
                /*
                 * Flush current sequence to make client obtain new one
                 * from server in case of disconnect/reconnect.
@@ -2344,12 +2512,28 @@ static int mdc_import_event(struct obd_device *obd, struct obd_import *imp,
 
                rc = obd_notify_observer(obd, obd, OBD_NOTIFY_INACTIVE);
                break;
-       }
        case IMP_EVENT_INVALIDATE: {
                struct ldlm_namespace *ns = obd->obd_namespace;
+               struct lu_env *env;
+               __u16 refcheck;
 
                ldlm_namespace_cleanup(ns, LDLM_FL_LOCAL_ONLY);
 
+               env = cl_env_get(&refcheck);
+               if (!IS_ERR(env)) {
+                       /* Reset grants. All pages go to failing rpcs due to
+                        * the invalid import.
+                        */
+                       osc_io_unplug(env, cli, NULL);
+
+                       cfs_hash_for_each_nolock(ns->ns_rs_hash,
+                                                osc_ldlm_resource_invalidate,
+                                                env, 0);
+                       cl_env_put(env, &refcheck);
+                       ldlm_namespace_cleanup(ns, LDLM_FL_LOCAL_ONLY);
+               } else {
+                       rc = PTR_ERR(env);
+               }
                break;
        }
        case IMP_EVENT_ACTIVE:
@@ -2358,10 +2542,15 @@ static int mdc_import_event(struct obd_device *obd, struct obd_import *imp,
                if (rc == 0)
                        rc = mdc_kuc_reregister(imp);
                break;
-       case IMP_EVENT_OCD:
+       case IMP_EVENT_OCD: {
+               struct obd_connect_data *ocd = &imp->imp_connect_data;
+
+               if (OCD_HAS_FLAG(ocd, GRANT))
+                       osc_init_grant(cli, ocd);
+
                rc = obd_notify_observer(obd, obd, OBD_NOTIFY_OCD);
                break;
-       case IMP_EVENT_DISCON:
+       }
        case IMP_EVENT_DEACTIVATE:
        case IMP_EVENT_ACTIVATE:
                break;
@@ -2410,6 +2599,12 @@ static int mdc_cancel_weight(struct ldlm_lock *lock)
        if (lock->l_policy_data.l_inodebits.bits & MDS_INODELOCK_OPEN)
                RETURN(0);
 
+       /* Special case for DoM locks, cancel only unused and granted locks */
+       if (ldlm_has_dom(lock) &&
+           (lock->l_granted_mode != lock->l_req_mode ||
+            osc_ldlm_weigh_ast(lock) != 0))
+               RETURN(0);
+
        RETURN(1);
 }
 
@@ -2458,25 +2653,21 @@ static void mdc_llog_finish(struct obd_device *obd)
        EXIT;
 }
 
-static int mdc_setup(struct obd_device *obd, struct lustre_cfg *cfg)
+int mdc_setup(struct obd_device *obd, struct lustre_cfg *cfg)
 {
-       int                             rc;
+       int rc;
+
        ENTRY;
 
-       rc = ptlrpcd_addref();
+       rc = osc_setup_common(obd, cfg);
        if (rc < 0)
                RETURN(rc);
 
-        rc = client_obd_setup(obd, cfg);
-        if (rc)
-               GOTO(err_ptlrpcd_decref, rc);
-#ifdef CONFIG_PROC_FS
-       obd->obd_vars = lprocfs_mdc_obd_vars;
-       lprocfs_obd_setup(obd);
-       lprocfs_alloc_md_stats(obd, 0);
-#endif
-       sptlrpc_lprocfs_cliobd_attach(obd);
-       ptlrpc_lprocfs_register_obd(obd);
+       rc = mdc_tunables_init(obd);
+       if (rc)
+               GOTO(err_osc_cleanup, rc);
+
+       obd->u.cli.cl_dom_min_inline_repsize = MDC_DOM_DEF_INLINE_REPSIZE;
 
        ns_register_cancel(obd->obd_namespace, mdc_cancel_weight);
 
@@ -2486,26 +2677,26 @@ static int mdc_setup(struct obd_device *obd, struct lustre_cfg *cfg)
         if (rc) {
                 CERROR("%s: failed to setup llogging subsystems: rc = %d\n",
                       obd->obd_name, rc);
-               GOTO(err_mdc_cleanup, rc);
+               GOTO(err_llog_cleanup, rc);
         }
 
        rc = mdc_changelog_cdev_init(obd);
        if (rc) {
                CERROR("%s: failed to setup changelog char device: rc = %d\n",
                       obd->obd_name, rc);
-               GOTO(err_mdc_cleanup, rc);
+               GOTO(err_changelog_cleanup, rc);
        }
 
-       EXIT;
-err_mdc_cleanup:
-       if (rc)
-               client_obd_cleanup(obd);
-
-err_ptlrpcd_decref:
-       if (rc)
-               ptlrpcd_decref();
+       RETURN(rc);
 
-        return rc;
+err_changelog_cleanup:
+       mdc_llog_finish(obd);
+err_llog_cleanup:
+       lprocfs_free_md_stats(obd);
+       ptlrpc_lprocfs_unregister_obd(obd);
+err_osc_cleanup:
+       osc_cleanup_common(obd);
+       return rc;
 }
 
 /* Initialize the default and maximum LOV EA sizes.  This allows
@@ -2536,15 +2727,11 @@ static int mdc_precleanup(struct obd_device *obd)
 {
        ENTRY;
 
-       /* Failsafe, ok if racy */
-       if (obd->obd_type->typ_refcnt <= 1)
-               libcfs_kkuc_group_rem(0, KUC_GRP_HSM);
-
+       osc_precleanup_common(obd);
        mdc_changelog_cdev_finish(obd);
 
        obd_cleanup_client_import(obd);
        ptlrpc_lprocfs_unregister_obd(obd);
-       lprocfs_obd_cleanup(obd);
        lprocfs_free_md_stats(obd);
        mdc_llog_finish(obd);
        RETURN(0);
@@ -2552,16 +2739,16 @@ static int mdc_precleanup(struct obd_device *obd)
 
 static int mdc_cleanup(struct obd_device *obd)
 {
-        ptlrpcd_decref();
-
-        return client_obd_cleanup(obd);
+       return osc_cleanup_common(obd);
 }
 
-static int mdc_process_config(struct obd_device *obd, size_t len, void *buf)
+int mdc_process_config(struct obd_device *obd, size_t len, void *buf)
 {
-        struct lustre_cfg *lcfg = buf;
-       int rc = class_process_proc_param(PARAM_MDC, obd->obd_vars, lcfg, obd);
-       return (rc > 0 ? 0: rc);
+       struct lustre_cfg *lcfg = buf;
+       size_t count  = class_modify_config(lcfg, PARAM_MDC,
+                                           &obd->obd_kset.kobj);
+
+       return count > 0 ? 0 : count;
 }
 
 static struct obd_ops mdc_obd_ops = {
@@ -2572,7 +2759,8 @@ static struct obd_ops mdc_obd_ops = {
         .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_reconnect        = osc_reconnect,
+       .o_disconnect       = osc_disconnect,
         .o_iocontrol        = mdc_iocontrol,
         .o_set_info_async   = mdc_set_info_async,
         .o_statfs           = mdc_statfs,
@@ -2601,6 +2789,7 @@ static struct md_ops mdc_md_ops = {
         .m_setxattr         = mdc_setxattr,
         .m_getxattr         = mdc_getxattr,
        .m_fsync                = mdc_fsync,
+       .m_file_resync          = mdc_file_resync,
        .m_read_page            = mdc_read_page,
         .m_unlink           = mdc_unlink,
         .m_cancel_unused    = mdc_cancel_unused,
@@ -2618,7 +2807,7 @@ static struct md_ops mdc_md_ops = {
 static int __init mdc_init(void)
 {
        return class_register_type(&mdc_obd_ops, &mdc_md_ops, true, NULL,
-                                  LUSTRE_MDC_NAME, NULL);
+                                  LUSTRE_MDC_NAME, &mdc_device_type);
 }
 
 static void __exit mdc_exit(void)