Whamcloud - gitweb
LU-3529 lod: create striped directory
[fs/lustre-release.git] / lustre / mdt / mdt_lib.c
index e662147..08d4809 100644 (file)
@@ -27,7 +27,7 @@
  * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2011, 2012, Intel Corporation.
+ * Copyright (c) 2011, 2013, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -67,7 +67,7 @@ void mdt_exit_ucred(struct mdt_thread_info *info)
        if (uc->uc_valid != UCRED_INIT) {
                uc->uc_suppgids[0] = uc->uc_suppgids[1] = -1;
                if (uc->uc_ginfo) {
-                       cfs_put_group_info(uc->uc_ginfo);
+                       put_group_info(uc->uc_ginfo);
                        uc->uc_ginfo = NULL;
                }
                if (uc->uc_identity) {
@@ -250,7 +250,7 @@ static int new_init_ucred(struct mdt_thread_info *info, ucred_init_type_t type,
        if (!remote && perm & CFS_SETGRP_PERM) {
                if (pud->pud_ngroups) {
                        /* setgroups for local client */
-                       ucred->uc_ginfo = cfs_groups_alloc(pud->pud_ngroups);
+                       ucred->uc_ginfo = groups_alloc(pud->pud_ngroups);
                        if (!ucred->uc_ginfo) {
                                CERROR("failed to alloc %d groups\n",
                                       pud->pud_ngroups);
@@ -292,7 +292,7 @@ static int new_init_ucred(struct mdt_thread_info *info, ucred_init_type_t type,
 out:
        if (rc) {
                if (ucred->uc_ginfo) {
-                       cfs_put_group_info(ucred->uc_ginfo);
+                       put_group_info(ucred->uc_ginfo);
                        ucred->uc_ginfo = NULL;
                }
                if (ucred->uc_identity) {
@@ -537,19 +537,22 @@ void mdt_dump_lmm(int level, const struct lov_mds_md *lmm)
 
         count = le16_to_cpu(((struct lov_user_md*)lmm)->lmm_stripe_count);
 
-        CDEBUG(level, "objid "LPX64", magic 0x%08X, pattern %#X\n",
-               le64_to_cpu(lmm->lmm_object_id), le32_to_cpu(lmm->lmm_magic),
-               le32_to_cpu(lmm->lmm_pattern));
+       CDEBUG(level, "objid "DOSTID", magic 0x%08X, pattern %#X\n",
+              POSTID(&lmm->lmm_oi), le32_to_cpu(lmm->lmm_magic),
+              le32_to_cpu(lmm->lmm_pattern));
         CDEBUG(level,"stripe_size=0x%x, stripe_count=0x%x\n",
                le32_to_cpu(lmm->lmm_stripe_size), count);
-        if (count == LOV_ALL_STRIPES)
+        if (count == LOV_ALL_STRIPES ||
+           le32_to_cpu(lmm->lmm_pattern) & LOV_PATTERN_F_RELEASED)
                 return;
-        LASSERT(count <= LOV_MAX_STRIPE_COUNT);
-        for (i = 0, lod = lmm->lmm_objects; i < count; i++, lod++)
-                CDEBUG(level, "stripe %u idx %u subobj "LPX64"/"LPX64"\n",
-                       i, le32_to_cpu(lod->l_ost_idx),
-                       le64_to_cpu(lod->l_object_seq),
-                       le64_to_cpu(lod->l_object_id));
+
+       LASSERT(count <= LOV_MAX_STRIPE_COUNT);
+       for (i = 0, lod = lmm->lmm_objects; i < count; i++, lod++) {
+               struct ost_id   oi;
+               ostid_le_to_cpu(&lod->l_ost_oi, &oi);
+               CDEBUG(level, "stripe %u idx %u subobj "DOSTID"\n",
+                      i, le32_to_cpu(lod->l_ost_idx), POSTID(&oi));
+       }
 }
 
 /* Shrink and/or grow reply buffers */
@@ -645,13 +648,21 @@ int mdt_fix_reply(struct mdt_thread_info *info)
                         /* don't return transno along with error */
                         lustre_msg_set_transno(pill->rc_req->rq_repmsg, 0);
                 } else {
-                        /* now we need to pack right LOV EA */
-                        lmm = req_capsule_server_get(pill, &RMF_MDT_MD);
-                        LASSERT(req_capsule_get_size(pill, &RMF_MDT_MD,
-                                                     RCL_SERVER) ==
-                                info->mti_attr.ma_lmm_size);
-                        memcpy(lmm, info->mti_attr.ma_lmm,
-                               info->mti_attr.ma_lmm_size);
+                       /* now we need to pack right LOV/LMV EA */
+                       lmm = req_capsule_server_get(pill, &RMF_MDT_MD);
+                       if (info->mti_attr.ma_valid & MA_LOV) {
+                               LASSERT(req_capsule_get_size(pill, &RMF_MDT_MD,
+                                                            RCL_SERVER) ==
+                                               info->mti_attr.ma_lmm_size);
+                               memcpy(lmm, info->mti_attr.ma_lmm,
+                                      info->mti_attr.ma_lmm_size);
+                       } else if (info->mti_attr.ma_valid & MA_LMV) {
+                               LASSERT(req_capsule_get_size(pill, &RMF_MDT_MD,
+                                                            RCL_SERVER) ==
+                                               info->mti_attr.ma_lmv_size);
+                               memcpy(lmm, info->mti_attr.ma_lmv,
+                                      info->mti_attr.ma_lmv_size);
+                       }
                 }
                 /* update mdt_max_mdsize so clients will be aware about that */
                 if (info->mti_mdt->mdt_max_mdsize < info->mti_attr.ma_lmm_size)
@@ -690,7 +701,7 @@ int mdt_handle_last_unlink(struct mdt_thread_info *info, struct mdt_object *mo,
                 repbody->valid |= OBD_MD_FLCOOKIE;
         }
 
-       if (info->mti_mdt->mdt_opts.mo_oss_capa &&
+       if (info->mti_mdt->mdt_lut.lut_oss_capa &&
            exp_connect_flags(info->mti_exp) & OBD_CONNECT_OSS_CAPA &&
            repbody->valid & OBD_MD_FLEASIZE) {
                 struct lustre_capa *capa;
@@ -708,101 +719,122 @@ int mdt_handle_last_unlink(struct mdt_thread_info *info, struct mdt_object *mo,
         RETURN(0);
 }
 
-static inline unsigned int attr_unpack(__u64 sa_valid) {
-        unsigned int ia_valid = 0;
-
-        if (sa_valid & MDS_ATTR_MODE)
-                ia_valid |= ATTR_MODE;
-        if (sa_valid & MDS_ATTR_UID)
-                ia_valid |= ATTR_UID;
-        if (sa_valid & MDS_ATTR_GID)
-                ia_valid |= ATTR_GID;
-        if (sa_valid & MDS_ATTR_SIZE)
-                ia_valid |= ATTR_SIZE;
-        if (sa_valid & MDS_ATTR_ATIME)
-                ia_valid |= ATTR_ATIME;
-        if (sa_valid & MDS_ATTR_MTIME)
-                ia_valid |= ATTR_MTIME;
-        if (sa_valid & MDS_ATTR_CTIME)
-                ia_valid |= ATTR_CTIME;
-        if (sa_valid & MDS_ATTR_ATIME_SET)
-                ia_valid |= ATTR_ATIME_SET;
-        if (sa_valid & MDS_ATTR_MTIME_SET)
-                ia_valid |= ATTR_MTIME_SET;
-        if (sa_valid & MDS_ATTR_FORCE)
-                ia_valid |= ATTR_FORCE;
-        if (sa_valid & MDS_ATTR_ATTR_FLAG)
-                ia_valid |= ATTR_ATTR_FLAG;
-        if (sa_valid & MDS_ATTR_KILL_SUID)
-                ia_valid |=  ATTR_KILL_SUID;
-        if (sa_valid & MDS_ATTR_KILL_SGID)
-                ia_valid |= ATTR_KILL_SGID;
-        if (sa_valid & MDS_ATTR_CTIME_SET)
-                ia_valid |= ATTR_CTIME_SET;
-        if (sa_valid & MDS_ATTR_FROM_OPEN)
-                ia_valid |= ATTR_FROM_OPEN;
-        if (sa_valid & MDS_ATTR_BLOCKS)
-                ia_valid |= ATTR_BLOCKS;
-        if (sa_valid & MDS_OPEN_OWNEROVERRIDE)
-                ia_valid |= MDS_OPEN_OWNEROVERRIDE;
-        return ia_valid;
-}
-
 static __u64 mdt_attr_valid_xlate(__u64 in, struct mdt_reint_record *rr,
                                   struct md_attr *ma)
 {
-        __u64 out;
+       __u64 out;
+
+       out = 0;
+       if (in & MDS_ATTR_MODE)
+               out |= LA_MODE;
+       if (in & MDS_ATTR_UID)
+               out |= LA_UID;
+       if (in & MDS_ATTR_GID)
+               out |= LA_GID;
+       if (in & MDS_ATTR_SIZE)
+               out |= LA_SIZE;
+       if (in & MDS_ATTR_BLOCKS)
+               out |= LA_BLOCKS;
+       if (in & MDS_ATTR_ATIME_SET)
+               out |= LA_ATIME;
+       if (in & MDS_ATTR_CTIME_SET)
+               out |= LA_CTIME;
+       if (in & MDS_ATTR_MTIME_SET)
+               out |= LA_MTIME;
+       if (in & MDS_ATTR_ATTR_FLAG)
+               out |= LA_FLAGS;
+       if (in & MDS_ATTR_KILL_SUID)
+               out |= LA_KILL_SUID;
+       if (in & MDS_ATTR_KILL_SGID)
+               out |= LA_KILL_SGID;
+
+       if (in & MDS_ATTR_FROM_OPEN)
+               rr->rr_flags |= MRF_OPEN_TRUNC;
+       if (in & MDS_OPEN_OWNEROVERRIDE)
+               ma->ma_attr_flags |= MDS_OWNEROVERRIDE;
+       if (in & MDS_ATTR_FORCE)
+               ma->ma_attr_flags |= MDS_PERM_BYPASS;
+
+       in &= ~(MDS_ATTR_MODE | MDS_ATTR_UID | MDS_ATTR_GID |
+               MDS_ATTR_ATIME | MDS_ATTR_MTIME | MDS_ATTR_CTIME |
+               MDS_ATTR_ATIME_SET | MDS_ATTR_CTIME_SET | MDS_ATTR_MTIME_SET |
+               MDS_ATTR_SIZE | MDS_ATTR_BLOCKS | MDS_ATTR_ATTR_FLAG |
+               MDS_ATTR_FORCE | MDS_ATTR_KILL_SUID | MDS_ATTR_KILL_SGID |
+               MDS_ATTR_FROM_OPEN | MDS_OPEN_OWNEROVERRIDE);
+       if (in != 0)
+               CERROR("Unknown attr bits: "LPX64"\n", in);
+       return out;
+}
 
-        out = 0;
-        if (in & ATTR_MODE)
-                out |= LA_MODE;
-        if (in & ATTR_UID)
-                out |= LA_UID;
-        if (in & ATTR_GID)
-                out |= LA_GID;
-        if (in & ATTR_SIZE)
-                out |= LA_SIZE;
-        if (in & ATTR_BLOCKS)
-                out |= LA_BLOCKS;
+void mdt_set_capainfo(struct mdt_thread_info *info, int offset,
+                     const struct lu_fid *fid, struct lustre_capa *capa)
+{
+       struct lu_capainfo *lci;
 
-        if (in & ATTR_FROM_OPEN)
-                rr->rr_flags |= MRF_OPEN_TRUNC;
+       LASSERT(offset >= 0 && offset < LU_CAPAINFO_MAX);
+       if (!info->mti_mdt->mdt_lut.lut_mds_capa ||
+           !(exp_connect_flags(info->mti_exp) & OBD_CONNECT_MDS_CAPA))
+               return;
 
-        if (in & ATTR_ATIME_SET)
-                out |= LA_ATIME;
+       lci = lu_capainfo_get(info->mti_env);
+       LASSERT(lci);
+       lci->lci_fid[offset]  = *fid;
+       lci->lci_capa[offset] = capa;
+}
 
-        if (in & ATTR_CTIME_SET)
-                out |= LA_CTIME;
+#ifdef DEBUG_CAPA
+void mdt_dump_capainfo(struct mdt_thread_info *info)
+{
+       struct lu_capainfo *lci = lu_capainfo_get(info->mti_env);
+       int i;
 
-        if (in & ATTR_MTIME_SET)
-                out |= LA_MTIME;
+       if (lci == NULL)
+               return;
 
-        if (in & ATTR_ATTR_FLAG)
-                out |= LA_FLAGS;
+       for (i = 0; i < LU_CAPAINFO_MAX; i++) {
+               if (lci->lci_capa[i] == NULL) {
+                       CERROR("no capa for index %d "DFID"\n",
+                              i, PFID(&lci->lci_fid[i]));
+                       continue;
+               }
+               if (lci->lci_capa[i] == BYPASS_CAPA) {
+                       CERROR("bypass for index %d "DFID"\n",
+                              i, PFID(&lci->lci_fid[i]));
+                       continue;
+               }
+               DEBUG_CAPA(D_ERROR, lci->lci_capa[i], "index %d", i);
+       }
+}
+#endif /* DEBUG_CAPA */
 
-        if (in & ATTR_KILL_SUID)
-                out |= LA_KILL_SUID;
+/* unpacking */
 
-        if (in & ATTR_KILL_SGID)
-                out |= LA_KILL_SGID;
+int mdt_name_unpack(struct req_capsule *pill,
+                   const struct req_msg_field *field,
+                   struct lu_name *ln,
+                   enum mdt_name_flags flags)
+{
+       ln->ln_name = req_capsule_client_get(pill, field);
+       ln->ln_namelen = req_capsule_get_size(pill, field, RCL_CLIENT) - 1;
 
-       if (in & MDS_OPEN_OWNEROVERRIDE)
-               ma->ma_attr_flags |= MDS_OWNEROVERRIDE;
+       if (!lu_name_is_valid(ln)) {
+               ln->ln_name = NULL;
+               ln->ln_namelen = 0;
 
-        if (in & ATTR_FORCE)
-                ma->ma_attr_flags |= MDS_PERM_BYPASS;
-
-        /*XXX need ATTR_RAW?*/
-        in &= ~(ATTR_MODE|ATTR_UID|ATTR_GID|ATTR_SIZE|ATTR_BLOCKS|
-                ATTR_ATIME|ATTR_MTIME|ATTR_CTIME|ATTR_FROM_OPEN|
-                ATTR_ATIME_SET|ATTR_CTIME_SET|ATTR_MTIME_SET|
-                ATTR_ATTR_FLAG|ATTR_RAW|MDS_OPEN_OWNEROVERRIDE|
-                ATTR_FORCE|ATTR_KILL_SUID|ATTR_KILL_SGID);
-        if (in != 0)
-                CERROR("Unknown attr bits: "LPX64"\n", in);
-        return out;
+               return -EPROTO;
+       }
+
+       if ((flags & MNF_FIX_ANON) &&
+           ln->ln_namelen == 1 && ln->ln_name[0] == '/') {
+               /* Newer (3.x) kernels use a name of "/" for the
+                * "anonymous" disconnected dentries from NFS
+                * filehandle conversion. See d_obtain_alias(). */
+               ln->ln_name = NULL;
+               ln->ln_namelen = 0;
+       }
+
+       return 0;
 }
-/* unpacking */
 
 static int mdt_setattr_unpack_rec(struct mdt_thread_info *info)
 {
@@ -827,7 +859,21 @@ static int mdt_setattr_unpack_rec(struct mdt_thread_info *info)
        uc->uc_suppgids[1] = -1;
 
         rr->rr_fid1 = &rec->sa_fid;
-        la->la_valid = mdt_attr_valid_xlate(attr_unpack(rec->sa_valid), rr, ma);
+       la->la_valid = mdt_attr_valid_xlate(rec->sa_valid, rr, ma);
+       /*  If MDS_ATTR_xTIME is set without MDS_ATTR_xTIME_SET and
+        *  the client does not have OBD_CONNECT_FULL20, convert it
+        *  to LA_xTIME. LU-3036 */
+       if (!(exp_connect_flags(info->mti_exp) & OBD_CONNECT_FULL20)) {
+               if (!(rec->sa_valid & MDS_ATTR_ATIME_SET) &&
+                    (rec->sa_valid & MDS_ATTR_ATIME))
+                       la->la_valid |= LA_ATIME;
+               if (!(rec->sa_valid & MDS_ATTR_MTIME_SET) &&
+                    (rec->sa_valid & MDS_ATTR_MTIME))
+                       la->la_valid |= LA_MTIME;
+               if (!(rec->sa_valid & MDS_ATTR_CTIME_SET) &&
+                    (rec->sa_valid & MDS_ATTR_CTIME))
+                       la->la_valid |= LA_CTIME;
+       }
         la->la_mode  = rec->sa_mode;
         la->la_flags = rec->sa_attr_flags;
         la->la_uid   = rec->sa_uid;
@@ -844,11 +890,16 @@ static int mdt_setattr_unpack_rec(struct mdt_thread_info *info)
        else
                ma->ma_attr_flags &= ~MDS_DATA_MODIFIED;
 
-        if (req_capsule_get_size(pill, &RMF_CAPA1, RCL_CLIENT))
-                mdt_set_capainfo(info, 0, rr->rr_fid1,
-                                 req_capsule_client_get(pill, &RMF_CAPA1));
+       if (rec->sa_bias & MDS_HSM_RELEASE)
+               ma->ma_attr_flags |= MDS_HSM_RELEASE;
+       else
+               ma->ma_attr_flags &= ~MDS_HSM_RELEASE;
 
-        RETURN(0);
+       if (req_capsule_get_size(pill, &RMF_CAPA1, RCL_CLIENT))
+               mdt_set_capainfo(info, 0, rr->rr_fid1,
+                                req_capsule_client_get(pill, &RMF_CAPA1));
+
+       RETURN(0);
 }
 
 static int mdt_ioepoch_unpack(struct mdt_thread_info *info)
@@ -906,6 +957,24 @@ static int mdt_setattr_unpack(struct mdt_thread_info *info)
         RETURN(rc);
 }
 
+static int mdt_hsm_release_unpack(struct mdt_thread_info *info)
+{
+       struct md_attr          *ma = &info->mti_attr;
+       struct req_capsule      *pill = info->mti_pill;
+       ENTRY;
+
+       if (!(ma->ma_attr_flags & MDS_HSM_RELEASE))
+               RETURN(0);
+
+       req_capsule_extend(pill, &RQF_MDS_RELEASE_CLOSE);
+
+       if (!(req_capsule_has_field(pill, &RMF_CLOSE_DATA, RCL_CLIENT) &&
+           req_capsule_field_present(pill, &RMF_CLOSE_DATA, RCL_CLIENT)))
+               RETURN(-EFAULT);
+
+       RETURN(0);
+}
+
 int mdt_close_unpack(struct mdt_thread_info *info)
 {
         int rc;
@@ -918,6 +987,11 @@ int mdt_close_unpack(struct mdt_thread_info *info)
        rc = mdt_setattr_unpack_rec(info);
        if (rc)
                RETURN(rc);
+
+       rc = mdt_hsm_release_unpack(info);
+       if (rc)
+               RETURN(rc);
+
        RETURN(mdt_init_ucred_reint(info));
 }
 
@@ -964,10 +1038,9 @@ static int mdt_create_unpack(struct mdt_thread_info *info)
                                  req_capsule_client_get(pill, &RMF_CAPA1));
         mdt_set_capainfo(info, 1, rr->rr_fid2, BYPASS_CAPA);
 
-       rr->rr_name = req_capsule_client_get(pill, &RMF_NAME);
-       rr->rr_namelen = req_capsule_get_size(pill, &RMF_NAME,
-                                             RCL_CLIENT) - 1;
-       LASSERT(rr->rr_name && rr->rr_namelen > 0);
+       rc = mdt_name_unpack(pill, &RMF_NAME, &rr->rr_name, 0);
+       if (rc < 0)
+               RETURN(rc);
 
        if (S_ISLNK(attr->la_mode)) {
                 const char *tgt = NULL;
@@ -981,10 +1054,19 @@ static int mdt_create_unpack(struct mdt_thread_info *info)
                         RETURN(-EFAULT);
         } else {
                 req_capsule_extend(pill, &RQF_MDS_REINT_CREATE_RMT_ACL);
-        }
+               if (S_ISDIR(attr->la_mode) &&
+                   req_capsule_get_size(pill, &RMF_EADATA, RCL_CLIENT) > 0) {
+                       sp->u.sp_ea.eadata =
+                               req_capsule_client_get(pill, &RMF_EADATA);
+                       sp->u.sp_ea.eadatalen =
+                               req_capsule_get_size(pill, &RMF_EADATA,
+                                                    RCL_CLIENT);
+                       sp->sp_cr_flags |= MDS_OPEN_HAS_EA;
+               }
+       }
 
-        rc = mdt_dlmreq_unpack(info);
-        RETURN(rc);
+       rc = mdt_dlmreq_unpack(info);
+       RETURN(rc);
 }
 
 static int mdt_link_unpack(struct mdt_thread_info *info)
@@ -1024,15 +1106,13 @@ static int mdt_link_unpack(struct mdt_thread_info *info)
                 mdt_set_capainfo(info, 1, rr->rr_fid2,
                                  req_capsule_client_get(pill, &RMF_CAPA2));
 
-        rr->rr_name = req_capsule_client_get(pill, &RMF_NAME);
-        if (rr->rr_name == NULL)
-                RETURN(-EFAULT);
-        rr->rr_namelen = req_capsule_get_size(pill, &RMF_NAME, RCL_CLIENT) - 1;
+       rc = mdt_name_unpack(pill, &RMF_NAME, &rr->rr_name, 0);
+       if (rc < 0)
+               RETURN(rc);
 
-       LASSERT(rr->rr_namelen > 0);
+       rc = mdt_dlmreq_unpack(info);
 
-        rc = mdt_dlmreq_unpack(info);
-        RETURN(rc);
+       RETURN(rc);
 }
 
 static int mdt_unlink_unpack(struct mdt_thread_info *info)
@@ -1071,22 +1151,27 @@ static int mdt_unlink_unpack(struct mdt_thread_info *info)
                 mdt_set_capainfo(info, 0, rr->rr_fid1,
                                  req_capsule_client_get(pill, &RMF_CAPA1));
 
-       rr->rr_name = req_capsule_client_get(pill, &RMF_NAME);
-       rr->rr_namelen = req_capsule_get_size(pill, &RMF_NAME, RCL_CLIENT) - 1;
-       if (rr->rr_name == NULL || rr->rr_namelen == 0)
-               RETURN(-EFAULT);
+       rc = mdt_name_unpack(pill, &RMF_NAME, &rr->rr_name, 0);
+       if (rc < 0)
+               RETURN(rc);
 
         if (rec->ul_bias & MDS_VTX_BYPASS)
                 ma->ma_attr_flags |= MDS_VTX_BYPASS;
         else
                 ma->ma_attr_flags &= ~MDS_VTX_BYPASS;
 
-        info->mti_spec.no_create = !!req_is_replay(mdt_info_req(info));
+       info->mti_spec.no_create = !!req_is_replay(mdt_info_req(info));
 
         rc = mdt_dlmreq_unpack(info);
         RETURN(rc);
 }
 
+static int mdt_rmentry_unpack(struct mdt_thread_info *info)
+{
+       info->mti_spec.sp_rm_entry = 1;
+       return mdt_unlink_unpack(info);
+}
+
 static int mdt_rename_unpack(struct mdt_thread_info *info)
 {
        struct lu_ucred         *uc = mdt_ucred(info);
@@ -1127,13 +1212,13 @@ static int mdt_rename_unpack(struct mdt_thread_info *info)
                 mdt_set_capainfo(info, 1, rr->rr_fid2,
                                  req_capsule_client_get(pill, &RMF_CAPA2));
 
-        rr->rr_name = req_capsule_client_get(pill, &RMF_NAME);
-        rr->rr_tgt = req_capsule_client_get(pill, &RMF_SYMTGT);
-        if (rr->rr_name == NULL || rr->rr_tgt == NULL)
-                RETURN(-EFAULT);
-        rr->rr_namelen = req_capsule_get_size(pill, &RMF_NAME, RCL_CLIENT) - 1;
-        rr->rr_tgtlen = req_capsule_get_size(pill, &RMF_SYMTGT, RCL_CLIENT) - 1;
-       LASSERT(rr->rr_namelen > 0 && rr->rr_tgtlen > 0);
+       rc = mdt_name_unpack(pill, &RMF_NAME, &rr->rr_name, 0);
+       if (rc < 0)
+               RETURN(rc);
+
+       rc = mdt_name_unpack(pill, &RMF_SYMTGT, &rr->rr_tgt_name, 0);
+       if (rc < 0)
+               RETURN(rc);
 
         if (rec->rn_bias & MDS_VTX_BYPASS)
                 ma->ma_attr_flags |= MDS_VTX_BYPASS;
@@ -1233,10 +1318,7 @@ static int mdt_open_unpack(struct mdt_thread_info *info)
 #endif
         }
 
-        rr->rr_name = req_capsule_client_get(pill, &RMF_NAME);
-        if (rr->rr_name == NULL)
-                RETURN(-EFAULT);
-        rr->rr_namelen = req_capsule_get_size(pill, &RMF_NAME, RCL_CLIENT) - 1;
+       mdt_name_unpack(pill, &RMF_NAME, &rr->rr_name, MNF_FIX_ANON);
 
         if (req_capsule_field_present(pill, &RMF_EADATA, RCL_CLIENT)) {
                 rr->rr_eadatalen = req_capsule_get_size(pill, &RMF_EADATA,
@@ -1265,12 +1347,13 @@ static int mdt_open_unpack(struct mdt_thread_info *info)
 
 static int mdt_setxattr_unpack(struct mdt_thread_info *info)
 {
-        struct mdt_reint_record   *rr   = &info->mti_rr;
-       struct lu_ucred           *uc   = mdt_ucred(info);
-        struct lu_attr            *attr = &info->mti_attr.ma_attr;
-        struct req_capsule        *pill = info->mti_pill;
-        struct mdt_rec_setxattr   *rec;
-        ENTRY;
+       struct mdt_reint_record *rr     = &info->mti_rr;
+       struct lu_ucred         *uc     = mdt_ucred(info);
+       struct lu_attr          *attr   = &info->mti_attr.ma_attr;
+       struct req_capsule      *pill   = info->mti_pill;
+       struct mdt_rec_setxattr *rec;
+       int                      rc;
+       ENTRY;
 
 
         CLASSERT(sizeof(struct mdt_rec_setxattr) ==
@@ -1300,11 +1383,9 @@ static int mdt_setxattr_unpack(struct mdt_thread_info *info)
         else
                 mdt_set_capainfo(info, 0, rr->rr_fid1, BYPASS_CAPA);
 
-        rr->rr_name = req_capsule_client_get(pill, &RMF_NAME);
-        if (rr->rr_name == NULL)
-                RETURN(-EFAULT);
-        rr->rr_namelen = req_capsule_get_size(pill, &RMF_NAME, RCL_CLIENT) - 1;
-        LASSERT(rr->rr_namelen > 0);
+       rc = mdt_name_unpack(pill, &RMF_NAME, &rr->rr_name, 0);
+       if (rc < 0)
+               RETURN(rc);
 
         if (req_capsule_field_present(pill, &RMF_EADATA, RCL_CLIENT)) {
                 rr->rr_eadatalen = req_capsule_get_size(pill, &RMF_EADATA,
@@ -1322,6 +1403,9 @@ static int mdt_setxattr_unpack(struct mdt_thread_info *info)
                 RETURN(-EFAULT);
         }
 
+       if (mdt_dlmreq_unpack(info) < 0)
+               RETURN(-EPROTO);
+
         RETURN(0);
 }
 
@@ -1329,13 +1413,14 @@ static int mdt_setxattr_unpack(struct mdt_thread_info *info)
 typedef int (*reint_unpacker)(struct mdt_thread_info *info);
 
 static reint_unpacker mdt_reint_unpackers[REINT_MAX] = {
-        [REINT_SETATTR]  = mdt_setattr_unpack,
-        [REINT_CREATE]   = mdt_create_unpack,
-        [REINT_LINK]     = mdt_link_unpack,
-        [REINT_UNLINK]   = mdt_unlink_unpack,
-        [REINT_RENAME]   = mdt_rename_unpack,
-        [REINT_OPEN]     = mdt_open_unpack,
-        [REINT_SETXATTR] = mdt_setxattr_unpack
+       [REINT_SETATTR]  = mdt_setattr_unpack,
+       [REINT_CREATE]   = mdt_create_unpack,
+       [REINT_LINK]     = mdt_link_unpack,
+       [REINT_UNLINK]   = mdt_unlink_unpack,
+       [REINT_RENAME]   = mdt_rename_unpack,
+       [REINT_OPEN]     = mdt_open_unpack,
+       [REINT_SETXATTR] = mdt_setxattr_unpack,
+       [REINT_RMENTRY]  = mdt_rmentry_unpack,
 };
 
 int mdt_reint_unpack(struct mdt_thread_info *info, __u32 op)