GOTO(out, rc = err_serious(-ENOMEM));
repbody = req_capsule_server_get(info->mti_pill, &RMF_MDT_BODY);
- repbody->fid1 = mdt->mdt_md_root_fid;
- repbody->valid |= OBD_MD_FLID;
+ repbody->mbo_fid1 = mdt->mdt_md_root_fid;
+ repbody->mbo_valid |= OBD_MD_FLID;
if (tsi->tsi_tgt->lut_mds_capa &&
exp_connect_flags(info->mti_exp) & OBD_CONNECT_MDS_CAPA) {
struct mdt_object *root;
struct lustre_capa *capa;
- root = mdt_object_find(info->mti_env, mdt, &repbody->fid1);
+ root = mdt_object_find(info->mti_env, mdt, &repbody->mbo_fid1);
if (IS_ERR(root))
GOTO(out, rc = PTR_ERR(root));
0);
mdt_object_put(info->mti_env, root);
if (rc == 0)
- repbody->valid |= OBD_MD_FLMDSCAPA;
+ repbody->mbo_valid |= OBD_MD_FLMDSCAPA;
}
EXIT;
out:
!(ma->ma_valid & MA_SOM))
return;
- b->valid |= OBD_MD_FLSIZE | OBD_MD_FLBLOCKS;
- b->size = ma->ma_som->msd_size;
- b->blocks = ma->ma_som->msd_blocks;
+ b->mbo_valid |= OBD_MD_FLSIZE | OBD_MD_FLBLOCKS;
+ b->mbo_size = ma->ma_som->msd_size;
+ b->mbo_blocks = ma->ma_som->msd_blocks;
}
void mdt_pack_attr2body(struct mdt_thread_info *info, struct mdt_body *b,
LASSERT(ma->ma_valid & MA_INODE);
- b->atime = attr->la_atime;
- b->mtime = attr->la_mtime;
- b->ctime = attr->la_ctime;
- b->mode = attr->la_mode;
- b->size = attr->la_size;
- b->blocks = attr->la_blocks;
- b->uid = attr->la_uid;
- b->gid = attr->la_gid;
- b->flags = attr->la_flags;
- b->nlink = attr->la_nlink;
- b->rdev = attr->la_rdev;
-
- /*XXX should pack the reply body according to lu_valid*/
- b->valid |= OBD_MD_FLCTIME | OBD_MD_FLUID |
- OBD_MD_FLGID | OBD_MD_FLTYPE |
- OBD_MD_FLMODE | OBD_MD_FLNLINK | OBD_MD_FLFLAGS |
- OBD_MD_FLATIME | OBD_MD_FLMTIME ;
-
- if (!S_ISREG(attr->la_mode)) {
- b->valid |= OBD_MD_FLSIZE | OBD_MD_FLBLOCKS | OBD_MD_FLRDEV;
+ b->mbo_atime = attr->la_atime;
+ b->mbo_mtime = attr->la_mtime;
+ b->mbo_ctime = attr->la_ctime;
+ b->mbo_mode = attr->la_mode;
+ b->mbo_size = attr->la_size;
+ b->mbo_blocks = attr->la_blocks;
+ b->mbo_uid = attr->la_uid;
+ b->mbo_gid = attr->la_gid;
+ b->mbo_flags = attr->la_flags;
+ b->mbo_nlink = attr->la_nlink;
+ b->mbo_rdev = attr->la_rdev;
+
+ /* XXX should pack the reply body according to lu_valid */
+ b->mbo_valid |= OBD_MD_FLCTIME | OBD_MD_FLUID |
+ OBD_MD_FLGID | OBD_MD_FLTYPE |
+ OBD_MD_FLMODE | OBD_MD_FLNLINK | OBD_MD_FLFLAGS |
+ OBD_MD_FLATIME | OBD_MD_FLMTIME ;
+
+ if (!S_ISREG(attr->la_mode)) {
+ b->mbo_valid |= OBD_MD_FLSIZE | OBD_MD_FLBLOCKS | OBD_MD_FLRDEV;
} else if (ma->ma_need & MA_LOV && !(ma->ma_valid & MA_LOV)) {
- /* means no objects are allocated on osts. */
- LASSERT(!(ma->ma_valid & MA_LOV));
- /* just ignore blocks occupied by extend attributes on MDS */
- b->blocks = 0;
- /* if no object is allocated on osts, the size on mds is valid. b=22272 */
- b->valid |= OBD_MD_FLSIZE | OBD_MD_FLBLOCKS;
+ /* means no objects are allocated on osts. */
+ LASSERT(!(ma->ma_valid & MA_LOV));
+ /* just ignore blocks occupied by extend attributes on MDS */
+ b->mbo_blocks = 0;
+ /* if no object is allocated on osts, the size on mds is valid.
+ * b=22272 */
+ b->mbo_valid |= OBD_MD_FLSIZE | OBD_MD_FLBLOCKS;
} else if ((ma->ma_valid & MA_LOV) && ma->ma_lmm != NULL &&
ma->ma_lmm->lmm_pattern & LOV_PATTERN_F_RELEASED) {
/* A released file stores its size on MDS. */
/* But return 1 block for released file, unless tools like tar
* will consider it fully sparse. (LU-3864)
*/
- if (unlikely(b->size == 0))
- b->blocks = 0;
+ if (unlikely(b->mbo_size == 0))
+ b->mbo_blocks = 0;
else
- b->blocks = 1;
- b->valid |= OBD_MD_FLSIZE | OBD_MD_FLBLOCKS;
+ b->mbo_blocks = 1;
+ b->mbo_valid |= OBD_MD_FLSIZE | OBD_MD_FLBLOCKS;
}
- if (fid) {
- b->fid1 = *fid;
- b->valid |= OBD_MD_FLID;
- CDEBUG(D_INODE, DFID": nlink=%d, mode=%o, size="LPU64"\n",
- PFID(fid), b->nlink, b->mode, b->size);
- }
+ if (fid) {
+ b->mbo_fid1 = *fid;
+ b->mbo_valid |= OBD_MD_FLID;
+ CDEBUG(D_INODE, DFID": nlink=%d, mode=%o, size="LPU64"\n",
+ PFID(fid), b->mbo_nlink,
+ b->mbo_mode, b->mbo_size);
+ }
- if (info)
- mdt_body_reverse_idmap(info, b);
+ if (info)
+ mdt_body_reverse_idmap(info, b);
- if (fid != NULL && (b->valid & OBD_MD_FLSIZE))
- CDEBUG(D_VFSTRACE, DFID": returning size %llu\n",
- PFID(fid), (unsigned long long)b->size);
+ if (fid != NULL && (b->mbo_valid & OBD_MD_FLSIZE))
+ CDEBUG(D_VFSTRACE, DFID": returning size %llu\n",
+ PFID(fid), (unsigned long long)b->mbo_size);
}
static inline int mdt_body_has_lov(const struct lu_attr *la,
- const struct mdt_body *body)
+ const struct mdt_body *body)
{
- return ((S_ISREG(la->la_mode) && (body->valid & OBD_MD_FLEASIZE)) ||
- (S_ISDIR(la->la_mode) && (body->valid & OBD_MD_FLDIREA )) );
+ return (S_ISREG(la->la_mode) && (body->mbo_valid & OBD_MD_FLEASIZE)) ||
+ (S_ISDIR(la->la_mode) && (body->mbo_valid & OBD_MD_FLDIREA));
}
void mdt_client_compatibility(struct mdt_thread_info *info)
if (S_ISDIR(lu_object_attr(&mdt_object_child(o)->mo_lu))) {
rc2 = mo_xattr_get(env, mdt_object_child(o), &LU_BUF_NULL,
XATTR_NAME_LMV);
+
+ if (rc2 == -ENODATA)
+ rc2 = mo_xattr_get(env, mdt_object_child(o),
+ &LU_BUF_NULL,
+ XATTR_NAME_DEFAULT_LMV);
+
if ((rc2 < 0 && rc2 != -ENODATA) || (rc2 > rc))
rc = rc2;
}
info->mti_buf.lb_buf = info->mti_big_lmm;
info->mti_buf.lb_len = info->mti_big_lmmsize;
rc = mo_xattr_get(env, mdt_object_child(o), &info->mti_buf, name);
- if (rc > 0)
- info->mti_big_lmm_used = 1;
RETURN(rc);
}
rc = mo_xattr_get(info->mti_env, next, buf, name);
if (rc > 0) {
+
+got:
if (strcmp(name, XATTR_NAME_LOV) == 0) {
- ma->ma_lmm_size = rc;
- ma->ma_valid |= MA_LOV;
+ if (info->mti_big_lmm_used)
+ ma->ma_lmm = info->mti_big_lmm;
+
+ /* NOT return LOV EA with hole to old client. */
+ if (unlikely(le32_to_cpu(ma->ma_lmm->lmm_pattern) &
+ LOV_PATTERN_F_HOLE) &&
+ !(exp_connect_flags(info->mti_exp) &
+ OBD_CONNECT_LFSCK)) {
+ return -EIO;
+ } else {
+ ma->ma_lmm_size = rc;
+ ma->ma_valid |= MA_LOV;
+ }
} else if (strcmp(name, XATTR_NAME_LMV) == 0) {
+ if (info->mti_big_lmm_used)
+ ma->ma_lmv = info->mti_big_lmm;
+
ma->ma_lmv_size = rc;
ma->ma_valid |= MA_LMV;
} else if (strcmp(name, XATTR_NAME_DEFAULT_LMV) == 0) {
ma->ma_valid |= MA_LMV_DEF;
}
+ /* Update mdt_max_mdsize so all clients will be aware that */
+ if (info->mti_mdt->mdt_max_mdsize < rc)
+ info->mti_mdt->mdt_max_mdsize = rc;
+
rc = 0;
} else if (rc == -ENODATA) {
/* no LOV EA */
return rc;
rc = mdt_big_xattr_get(info, o, name);
if (rc > 0) {
- if (!strcmp(name, XATTR_NAME_LOV)) {
- ma->ma_valid |= MA_LOV;
- ma->ma_lmm = info->mti_big_lmm;
- ma->ma_lmm_size = rc;
- } else if (!strcmp(name, XATTR_NAME_LMV)) {
- ma->ma_valid |= MA_LMV;
- ma->ma_lmv = info->mti_big_lmm;
- ma->ma_lmv_size = rc;
- } else {
- return -EINVAL;
- }
-
- /* update mdt_max_mdsize so all clients
- * will be aware about that */
- if (info->mti_mdt->mdt_max_mdsize < rc)
- info->mti_mdt->mdt_max_mdsize = rc;
- rc = 0;
+ info->mti_big_lmm_used = 1;
+ goto got;
}
}
if (mdt_object_remote(o)) {
/* This object is located on remote node.*/
- /* Return -EIO for old client */
+ /* Return -ENOTSUPP for old client */
if (!mdt_is_dne_client(req->rq_export))
- GOTO(out, rc = -EIO);
+ GOTO(out, rc = -ENOTSUPP);
- repbody->fid1 = *mdt_object_fid(o);
- repbody->valid = OBD_MD_FLID | OBD_MD_MDS;
+ repbody->mbo_fid1 = *mdt_object_fid(o);
+ repbody->mbo_valid = OBD_MD_FLID | OBD_MD_MDS;
GOTO(out, rc = 0);
}
- if (reqbody->eadatasize > 0) {
+ if (reqbody->mbo_eadatasize > 0) {
buffer->lb_buf = req_capsule_server_get(pill, &RMF_MDT_MD);
if (buffer->lb_buf == NULL)
GOTO(out, rc = -EPROTO);
/* If it is dir object and client require MEA, then we got MEA */
if (S_ISDIR(lu_object_attr(&next->mo_lu)) &&
- (reqbody->valid & (OBD_MD_MEA | OBD_MD_DEFAULT_MEA))) {
+ (reqbody->mbo_valid & (OBD_MD_MEA | OBD_MD_DEFAULT_MEA))) {
/* Assumption: MDT_MD size is enough for lmv size. */
ma->ma_lmv = buffer->lb_buf;
ma->ma_lmv_size = buffer->lb_len;
ma->ma_need = MA_INODE;
if (ma->ma_lmv_size > 0) {
- if (reqbody->valid & OBD_MD_MEA)
+ if (reqbody->mbo_valid & OBD_MD_MEA)
ma->ma_need |= MA_LMV;
- else if (reqbody->valid & OBD_MD_DEFAULT_MEA)
+ else if (reqbody->mbo_valid & OBD_MD_DEFAULT_MEA)
ma->ma_need |= MA_LMV_DEF;
}
} else {
}
if (S_ISDIR(lu_object_attr(&next->mo_lu)) &&
- reqbody->valid & OBD_MD_FLDIREA &&
+ reqbody->mbo_valid & OBD_MD_FLDIREA &&
lustre_msg_get_opc(req->rq_reqmsg) == MDS_GETATTR) {
/* get default stripe info for this dir. */
ma->ma_need |= MA_LOV_DEF;
/* if file is released, check if a restore is running */
if ((ma->ma_valid & MA_HSM) && (ma->ma_hsm.mh_flags & HS_RELEASED) &&
mdt_hsm_restore_is_running(info, mdt_object_fid(o))) {
- repbody->t_state = MS_RESTORE;
- repbody->valid |= OBD_MD_TSTATE;
+ repbody->mbo_t_state = MS_RESTORE;
+ repbody->mbo_valid |= OBD_MD_TSTATE;
}
is_root = lu_fid_eq(mdt_object_fid(o), &info->mti_mdt->mdt_md_root_fid);
if (mdt_body_has_lov(la, reqbody)) {
if (ma->ma_valid & MA_LOV) {
LASSERT(ma->ma_lmm_size);
- repbody->eadatasize = ma->ma_lmm_size;
- if (S_ISDIR(la->la_mode))
- repbody->valid |= OBD_MD_FLDIREA;
- else
- repbody->valid |= OBD_MD_FLEASIZE;
- mdt_dump_lmm(D_INFO, ma->ma_lmm, repbody->valid);
+ repbody->mbo_eadatasize = ma->ma_lmm_size;
+ if (S_ISDIR(la->la_mode))
+ repbody->mbo_valid |= OBD_MD_FLDIREA;
+ else
+ repbody->mbo_valid |= OBD_MD_FLEASIZE;
+ mdt_dump_lmm(D_INFO, ma->ma_lmm, repbody->mbo_valid);
}
if (ma->ma_valid & MA_LMV) {
+ /* Return -ENOTSUPP for old client */
+ if (!mdt_is_striped_client(req->rq_export))
+ RETURN(-ENOTSUPP);
+
LASSERT(S_ISDIR(la->la_mode));
mdt_dump_lmv(D_INFO, ma->ma_lmv);
- repbody->eadatasize = ma->ma_lmv_size;
- repbody->valid |= (OBD_MD_FLDIREA|OBD_MD_MEA);
+ repbody->mbo_eadatasize = ma->ma_lmv_size;
+ repbody->mbo_valid |= (OBD_MD_FLDIREA|OBD_MD_MEA);
}
if (ma->ma_valid & MA_LMV_DEF) {
+ /* Return -ENOTSUPP for old client */
+ if (!mdt_is_striped_client(req->rq_export))
+ RETURN(-ENOTSUPP);
LASSERT(S_ISDIR(la->la_mode));
- repbody->eadatasize = ma->ma_lmv_size;
- repbody->valid |= (OBD_MD_FLDIREA|OBD_MD_DEFAULT_MEA);
+ repbody->mbo_eadatasize = ma->ma_lmv_size;
+ repbody->mbo_valid |= (OBD_MD_FLDIREA |
+ OBD_MD_DEFAULT_MEA);
}
} else if (S_ISLNK(la->la_mode) &&
- reqbody->valid & OBD_MD_LINKNAME) {
+ reqbody->mbo_valid & OBD_MD_LINKNAME) {
buffer->lb_buf = ma->ma_lmm;
/* eadatasize from client includes NULL-terminator, so
* there is no need to read it */
- buffer->lb_len = reqbody->eadatasize - 1;
+ buffer->lb_len = reqbody->mbo_eadatasize - 1;
rc = mo_readlink(env, next, buffer);
if (unlikely(rc <= 0)) {
CERROR("%s: readlink failed for "DFID": rc = %d\n",
if (OBD_FAIL_CHECK(OBD_FAIL_MDS_READLINK_EPROTO))
rc -= 2;
- repbody->valid |= OBD_MD_LINKNAME;
+ repbody->mbo_valid |= OBD_MD_LINKNAME;
/* we need to report back size with NULL-terminator
* because client expects that */
- repbody->eadatasize = rc + 1;
- if (repbody->eadatasize != reqbody->eadatasize)
+ repbody->mbo_eadatasize = rc + 1;
+ if (repbody->mbo_eadatasize != reqbody->mbo_eadatasize)
CDEBUG(D_INODE, "%s: Read shorter symlink %d "
"on "DFID ", expected %d\n",
mdt_obd_name(info->mti_mdt),
rc, PFID(mdt_object_fid(o)),
- reqbody->eadatasize - 1);
+ reqbody->mbo_eadatasize - 1);
/* NULL terminate */
((char *)ma->ma_lmm)[rc] = 0;
}
}
- if (reqbody->valid & OBD_MD_FLMODEASIZE) {
- repbody->max_cookiesize = 0;
- repbody->max_mdsize = info->mti_mdt->mdt_max_mdsize;
- repbody->valid |= OBD_MD_FLMODEASIZE;
- CDEBUG(D_INODE, "I am going to change the MAX_MD_SIZE & "
- "MAX_COOKIE to : %d:%d\n", repbody->max_mdsize,
- repbody->max_cookiesize);
- }
+ if (reqbody->mbo_valid & OBD_MD_FLMODEASIZE) {
+ repbody->mbo_max_cookiesize = 0;
+ repbody->mbo_max_mdsize = info->mti_mdt->mdt_max_mdsize;
+ repbody->mbo_valid |= OBD_MD_FLMODEASIZE;
+ CDEBUG(D_INODE, "I am going to change the MAX_MD_SIZE & "
+ "MAX_COOKIE to : %d:%d\n", repbody->mbo_max_mdsize,
+ repbody->mbo_max_cookiesize);
+ }
- if (exp_connect_rmtclient(info->mti_exp) &&
- reqbody->valid & OBD_MD_FLRMTPERM) {
- void *buf = req_capsule_server_get(pill, &RMF_ACL);
+ if (exp_connect_rmtclient(info->mti_exp) &&
+ reqbody->mbo_valid & OBD_MD_FLRMTPERM) {
+ void *buf = req_capsule_server_get(pill, &RMF_ACL);
- /* mdt_getattr_lock only */
- rc = mdt_pack_remote_perm(info, o, buf);
- if (rc) {
- repbody->valid &= ~OBD_MD_FLRMTPERM;
- repbody->aclsize = 0;
- RETURN(rc);
- } else {
- repbody->valid |= OBD_MD_FLRMTPERM;
- repbody->aclsize = sizeof(struct mdt_remote_perm);
- }
- }
+ /* mdt_getattr_lock only */
+ rc = mdt_pack_remote_perm(info, o, buf);
+ if (rc) {
+ repbody->mbo_valid &= ~OBD_MD_FLRMTPERM;
+ repbody->mbo_aclsize = 0;
+ RETURN(rc);
+ } else {
+ repbody->mbo_valid |= OBD_MD_FLRMTPERM;
+ repbody->mbo_aclsize = sizeof(struct mdt_remote_perm);
+ }
+ }
#ifdef CONFIG_FS_POSIX_ACL
else if ((exp_connect_flags(req->rq_export) & OBD_CONNECT_ACL) &&
- (reqbody->valid & OBD_MD_FLACL)) {
+ (reqbody->mbo_valid & OBD_MD_FLACL)) {
buffer->lb_buf = req_capsule_server_get(pill, &RMF_ACL);
buffer->lb_len = req_capsule_get_size(pill,
&RMF_ACL, RCL_SERVER);
XATTR_NAME_ACL_ACCESS);
if (rc < 0) {
if (rc == -ENODATA) {
- repbody->aclsize = 0;
- repbody->valid |= OBD_MD_FLACL;
+ repbody->mbo_aclsize = 0;
+ repbody->mbo_valid |= OBD_MD_FLACL;
rc = 0;
} else if (rc == -EOPNOTSUPP) {
rc = 0;
PFID(mdt_object_fid(o)), rc);
}
} else {
- repbody->aclsize = rc;
- repbody->valid |= OBD_MD_FLACL;
- rc = 0;
- }
- }
- }
+ repbody->mbo_aclsize = rc;
+ repbody->mbo_valid |= OBD_MD_FLACL;
+ rc = 0;
+ }
+ }
+ }
#endif
- if (reqbody->valid & OBD_MD_FLMDSCAPA &&
+ if (reqbody->mbo_valid & OBD_MD_FLMDSCAPA &&
info->mti_mdt->mdt_lut.lut_mds_capa &&
exp_connect_flags(info->mti_exp) & OBD_CONNECT_MDS_CAPA) {
struct lustre_capa *capa;
rc = mo_capa_get(env, next, capa, 0);
if (rc)
RETURN(rc);
- repbody->valid |= OBD_MD_FLMDSCAPA;
+ repbody->mbo_valid |= OBD_MD_FLMDSCAPA;
}
out:
*capa = *c;
rc = mo_capa_get(info->mti_env, mdt_object_child(obj), capa, 1);
if (rc == 0)
- body->valid |= OBD_MD_FLOSSCAPA;
+ body->mbo_valid |= OBD_MD_FLOSSCAPA;
RETURN(rc);
}
reqbody = req_capsule_client_get(pill, &RMF_MDT_BODY);
LASSERT(reqbody);
- if (reqbody->valid & OBD_MD_FLOSSCAPA) {
+ if (reqbody->mbo_valid & OBD_MD_FLOSSCAPA) {
rc = req_capsule_server_pack(pill);
if (unlikely(rc))
RETURN(err_serious(rc));
* guess at EA size by just reading it from disk.
* Exceptions are readdir and (missing) directory striping */
/* Readlink */
- if (reqbody->valid & OBD_MD_LINKNAME) {
+ if (reqbody->mbo_valid & OBD_MD_LINKNAME) {
/* No easy way to know how long is the symlink, but it cannot
* be more than PATH_MAX, so we allocate +1 */
rc = PATH_MAX + 1;
*/
} else if (lu_fid_eq(mdt_object_fid(obj),
&info->mti_mdt->mdt_md_root_fid) &&
- (reqbody->valid & OBD_MD_FLDIREA) &&
+ (reqbody->mbo_valid & OBD_MD_FLDIREA) &&
(lustre_msg_get_opc(mdt_info_req(info)->rq_reqmsg) ==
MDS_GETATTR)) {
/* Should the default strping be bigger, mdt_fix_reply
repbody = req_capsule_server_get(pill, &RMF_MDT_BODY);
LASSERT(repbody != NULL);
- repbody->eadatasize = 0;
- repbody->aclsize = 0;
+ repbody->mbo_eadatasize = 0;
+ repbody->mbo_aclsize = 0;
- if (reqbody->valid & OBD_MD_FLRMTPERM)
- rc = mdt_init_ucred(info, reqbody);
- else
- rc = mdt_check_ucred(info);
- if (unlikely(rc))
- GOTO(out_shrink, rc);
+ if (reqbody->mbo_valid & OBD_MD_FLRMTPERM)
+ rc = mdt_init_ucred(info, reqbody);
+ else
+ rc = mdt_check_ucred(info);
+ if (unlikely(rc))
+ GOTO(out_shrink, rc);
- info->mti_cross_ref = !!(reqbody->valid & OBD_MD_FLCROSSREF);
+ info->mti_cross_ref = !!(reqbody->mbo_valid & OBD_MD_FLCROSSREF);
- /*
- * Don't check capability at all, because rename might getattr for
- * remote obj, and at that time no capability is available.
- */
- mdt_set_capainfo(info, 1, &reqbody->fid1, BYPASS_CAPA);
- rc = mdt_getattr_internal(info, obj, 0);
- if (reqbody->valid & OBD_MD_FLRMTPERM)
+ /*
+ * Don't check capability at all, because rename might getattr for
+ * remote obj, and at that time no capability is available.
+ */
+ mdt_set_capainfo(info, 1, &reqbody->mbo_fid1, BYPASS_CAPA);
+ rc = mdt_getattr_internal(info, obj, 0);
+ if (reqbody->mbo_valid & OBD_MD_FLRMTPERM)
mdt_exit_ucred(info);
EXIT;
out_shrink:
return rc;
}
-static int mdt_is_subdir(struct tgt_session_info *tsi)
-{
- struct mdt_thread_info *info = tsi2mdt_info(tsi);
- struct mdt_object *o = info->mti_object;
- struct req_capsule *pill = info->mti_pill;
- const struct mdt_body *body = info->mti_body;
- struct mdt_body *repbody;
- int rc;
- ENTRY;
-
- LASSERT(o != NULL);
-
- repbody = req_capsule_server_get(pill, &RMF_MDT_BODY);
-
- /*
- * We save last checked parent fid to @repbody->fid1 for remote
- * directory case.
- */
- LASSERT(fid_is_sane(&body->fid2));
- LASSERT(mdt_object_exists(o) && !mdt_object_remote(o));
- rc = mdo_is_subdir(info->mti_env, mdt_object_child(o),
- &body->fid2, &repbody->fid1);
- if (rc == 0 || rc == -EREMOTE)
- repbody->valid |= OBD_MD_FLID;
-
- mdt_thread_info_fini(info);
- RETURN(rc);
-}
-
static int mdt_swap_layouts(struct tgt_session_info *tsi)
{
struct mdt_thread_info *info;
ldlm_request_cancel(req, info->mti_dlm_req, 0);
if (req_capsule_get_size(info->mti_pill, &RMF_CAPA1, RCL_CLIENT))
- mdt_set_capainfo(info, 0, &info->mti_body->fid1,
+ mdt_set_capainfo(info, 0, &info->mti_body->mbo_fid1,
req_capsule_client_get(info->mti_pill,
&RMF_CAPA1));
if (req_capsule_get_size(info->mti_pill, &RMF_CAPA2, RCL_CLIENT))
- mdt_set_capainfo(info, 1, &info->mti_body->fid2,
+ mdt_set_capainfo(info, 1, &info->mti_body->mbo_fid2,
req_capsule_client_get(info->mti_pill,
&RMF_CAPA2));
o1 = info->mti_object;
o = o2 = mdt_object_find(info->mti_env, info->mti_mdt,
- &info->mti_body->fid2);
+ &info->mti_body->mbo_fid2);
if (IS_ERR(o))
GOTO(out, rc = PTR_ERR(o));
if (mdt_object_remote(o) || !mdt_object_exists(o)) /* remote object */
GOTO(put, rc = -ENOENT);
- rc = lu_fid_cmp(&info->mti_body->fid1, &info->mti_body->fid2);
+ rc = lu_fid_cmp(&info->mti_body->mbo_fid1, &info->mti_body->mbo_fid2);
if (unlikely(rc == 0)) /* same file, you kidding me? no-op. */
GOTO(put, rc);
int rc;
ENTRY;
- if (reqbody->valid != OBD_MD_FLID)
+ if (reqbody->mbo_valid != OBD_MD_FLID)
RETURN(0);
LASSERT(!info->mti_cross_ref);
#endif
if (rc == 0) {
repbody = req_capsule_server_get(info->mti_pill, &RMF_MDT_BODY);
- repbody->fid1 = *child_fid;
- repbody->valid = OBD_MD_FLID;
+ repbody->mbo_fid1 = *child_fid;
+ repbody->mbo_valid = OBD_MD_FLID;
}
RETURN(1);
}
"ldlm_rep = %p\n",
PFID(mdt_object_fid(child)), ldlm_rep);
- if (is_resent) {
- /* Do not take lock for resent case. */
- lock = ldlm_handle2lock(&lhc->mlh_reg_lh);
- LASSERTF(lock != NULL, "Invalid lock handle "LPX64"\n",
- lhc->mlh_reg_lh.cookie);
- LASSERT(fid_res_name_eq(mdt_object_fid(child),
- &lock->l_resource->lr_name));
- LDLM_LOCK_PUT(lock);
- } else {
+ rc = mdt_check_resent_lock(info, child, lhc);
+ if (rc < 0) {
+ RETURN(-EPROTO);
+ } else if (rc > 0) {
mdt_lock_handle_init(lhc);
mdt_lock_reg_init(lhc, LCK_PR);
if (unlikely(reqbody == NULL))
RETURN(err_serious(-EPROTO));
- *child_fid = reqbody->fid2;
+ *child_fid = reqbody->mbo_fid2;
if (unlikely(!fid_is_sane(child_fid)))
RETURN(err_serious(-EINVAL));
CDEBUG(D_INODE, "getattr with lock for "DFID"/"DFID", "
"ldlm_rep = %p\n",
PFID(mdt_object_fid(parent)),
- PFID(&reqbody->fid2), ldlm_rep);
+ PFID(&reqbody->mbo_fid2), ldlm_rep);
}
mdt_set_disposition(info, ldlm_rep, DISP_LOOKUP_EXECD);
if (unlikely(IS_ERR(child)))
GOTO(out_parent, rc = PTR_ERR(child));
- if (is_resent) {
- /* Do not take lock for resent case. */
- lock = ldlm_handle2lock(&lhc->mlh_reg_lh);
- LASSERTF(lock != NULL, "Invalid lock handle "LPX64"\n",
- lhc->mlh_reg_lh.cookie);
- if (!fid_res_name_eq(mdt_object_fid(child),
- &lock->l_resource->lr_name)) {
- LASSERTF(fid_res_name_eq(mdt_object_fid(parent),
- &lock->l_resource->lr_name),
- "Lock res_id: "DLDLMRES", fid: "DFID"\n",
- PLDLMRES(lock->l_resource),
- PFID(mdt_object_fid(parent)));
- CWARN("Although resent, but still not get child lock"
- "parent:"DFID" child:"DFID"\n",
- PFID(mdt_object_fid(parent)),
- PFID(mdt_object_fid(child)));
- lustre_msg_clear_flags(req->rq_reqmsg, MSG_RESENT);
- LDLM_LOCK_PUT(lock);
- GOTO(relock, 0);
- }
- LDLM_LOCK_PUT(lock);
- } else {
-relock:
+ rc = mdt_check_resent_lock(info, child, lhc);
+ if (rc < 0) {
+ GOTO(out_child, rc);
+ } else if (rc > 0) {
OBD_FAIL_TIMEOUT(OBD_FAIL_MDS_RESEND, obd_timeout*2);
mdt_lock_handle_init(lhc);
mdt_lock_reg_init(lhc, LCK_PR);
repbody = req_capsule_server_get(info->mti_pill, &RMF_MDT_BODY);
LASSERT(repbody != NULL);
- info->mti_cross_ref = !!(reqbody->valid & OBD_MD_FLCROSSREF);
- repbody->eadatasize = 0;
- repbody->aclsize = 0;
+ info->mti_cross_ref = !!(reqbody->mbo_valid & OBD_MD_FLCROSSREF);
+ repbody->mbo_eadatasize = 0;
+ repbody->mbo_aclsize = 0;
rc = mdt_init_ucred(info, reqbody);
if (unlikely(rc))
* reqbody->size contains offset of where to start to read and
* reqbody->nlink contains number bytes to read.
*/
- rdpg->rp_hash = reqbody->size;
- if (rdpg->rp_hash != reqbody->size) {
- CERROR("Invalid hash: "LPX64" != "LPX64"\n",
- rdpg->rp_hash, reqbody->size);
- RETURN(-EFAULT);
- }
+ rdpg->rp_hash = reqbody->mbo_size;
+ if (rdpg->rp_hash != reqbody->mbo_size) {
+ CERROR("Invalid hash: "LPX64" != "LPX64"\n",
+ rdpg->rp_hash, reqbody->mbo_size);
+ RETURN(-EFAULT);
+ }
- rdpg->rp_attrs = reqbody->mode;
+ rdpg->rp_attrs = reqbody->mbo_mode;
if (exp_connect_flags(tsi->tsi_exp) & OBD_CONNECT_64BITHASH)
rdpg->rp_attrs |= LUDA_64BITHASH;
- rdpg->rp_count = min_t(unsigned int, reqbody->nlink,
+ rdpg->rp_count = min_t(unsigned int, reqbody->mbo_nlink,
exp_max_brw_size(tsi->tsi_exp));
rdpg->rp_npages = (rdpg->rp_count + PAGE_CACHE_SIZE - 1) >>
PAGE_CACHE_SHIFT;
if (req_capsule_has_field(pill, &RMF_MDT_BODY, RCL_SERVER)) {
repbody = req_capsule_server_get(pill, &RMF_MDT_BODY);
LASSERT(repbody);
- repbody->eadatasize = 0;
- repbody->aclsize = 0;
+ repbody->mbo_eadatasize = 0;
+ repbody->mbo_aclsize = 0;
}
OBD_FAIL_TIMEOUT(OBD_FAIL_MDS_REINT_DELAY, 10);
if (OBD_FAIL_CHECK(OBD_FAIL_MDS_SYNC_PACK))
RETURN(err_serious(-ENOMEM));
- if (fid_seq(&tsi->tsi_mdt_body->fid1) == 0) {
+ if (fid_seq(&tsi->tsi_mdt_body->mbo_fid1) == 0) {
rc = mdt_device_sync(tsi->tsi_env, mdt_exp2dev(tsi->tsi_exp));
} else {
struct mdt_thread_info *info = tsi2mdt_info(tsi);
RETURN(0);
}
+int mdt_check_resent_lock(struct mdt_thread_info *info,
+ struct mdt_object *mo,
+ struct mdt_lock_handle *lhc)
+{
+ /* the lock might already be gotten in ldlm_handle_enqueue() */
+ if (lustre_handle_is_used(&lhc->mlh_reg_lh)) {
+ struct ptlrpc_request *req = mdt_info_req(info);
+ struct ldlm_lock *lock;
+
+ lock = ldlm_handle2lock(&lhc->mlh_reg_lh);
+ LASSERT(lustre_msg_get_flags(req->rq_reqmsg) & MSG_RESENT);
+ LASSERTF(lock != NULL, "Invalid lock handle "LPX64"\n",
+ lhc->mlh_reg_lh.cookie);
+
+ if (!fid_res_name_eq(mdt_object_fid(mo),
+ &lock->l_resource->lr_name)) {
+ CWARN("%s: Although resent, but still not "
+ "get child lock:"DFID"\n",
+ info->mti_exp->exp_obd->obd_name,
+ PFID(mdt_object_fid(mo)));
+ LDLM_LOCK_PUT(lock);
+ RETURN(-EPROTO);
+ }
+ LDLM_LOCK_PUT(lock);
+ return 0;
+ }
+ return 1;
+}
+
int mdt_remote_object_lock(struct mdt_thread_info *mti,
struct mdt_object *o, const struct lu_fid *fid,
struct lustre_handle *lh, ldlm_mode_t mode,
if (body == NULL)
RETURN(-EFAULT);
- if (!(body->valid & OBD_MD_FLID))
- RETURN(0);
+ if (!(body->mbo_valid & OBD_MD_FLID))
+ RETURN(0);
- if (!fid_is_sane(&body->fid1)) {
- CERROR("Invalid fid: "DFID"\n", PFID(&body->fid1));
+ if (!fid_is_sane(&body->mbo_fid1)) {
+ CERROR("Invalid fid: "DFID"\n", PFID(&body->mbo_fid1));
RETURN(-EINVAL);
}
*/
if (req_capsule_has_field(pill, &RMF_CAPA1, RCL_CLIENT) &&
req_capsule_get_size(pill, &RMF_CAPA1, RCL_CLIENT))
- mdt_set_capainfo(info, 0, &body->fid1,
- req_capsule_client_get(pill, &RMF_CAPA1));
-
- obj = mdt_object_find(env, info->mti_mdt, &body->fid1);
- if (!IS_ERR(obj)) {
- if ((flags & HABEO_CORPUS) &&
- !mdt_object_exists(obj)) {
- mdt_object_put(env, obj);
- /* for capability renew ENOENT will be handled in
- * mdt_renew_capa */
- if (body->valid & OBD_MD_FLOSSCAPA)
+ mdt_set_capainfo(info, 0, &body->mbo_fid1,
+ req_capsule_client_get(pill, &RMF_CAPA1));
+
+ obj = mdt_object_find(env, info->mti_mdt, &body->mbo_fid1);
+ if (!IS_ERR(obj)) {
+ if ((flags & HABEO_CORPUS) &&
+ !mdt_object_exists(obj)) {
+ mdt_object_put(env, obj);
+ /* for capability renew ENOENT will be handled in
+ * mdt_renew_capa */
+ if (body->mbo_valid & OBD_MD_FLOSSCAPA)
rc = 0;
else
rc = -ENOENT;
if (req_capsule_has_field(pill, &RMF_CAPA1, RCL_CLIENT) &&
req_capsule_get_size(pill, &RMF_CAPA1, RCL_CLIENT) > 0) {
lc = req_capsule_client_get(pill, &RMF_CAPA1);
- mdt_set_capainfo(mti, 0, &tsi->tsi_mdt_body->fid1, lc);
+ mdt_set_capainfo(mti, 0, &tsi->tsi_mdt_body->mbo_fid1,
+ lc);
}
}
mti->mti_body = tsi->tsi_mdt_body;
};
static int
-mdt_intent_lock_replace(struct mdt_thread_info *info, struct ldlm_lock **lockp,
- struct ldlm_lock *new_lock, struct mdt_lock_handle *lh,
+mdt_intent_lock_replace(struct mdt_thread_info *info,
+ struct ldlm_lock **lockp,
+ struct mdt_lock_handle *lh,
__u64 flags)
{
struct ptlrpc_request *req = mdt_info_req(info);
struct ldlm_lock *lock = *lockp;
+ struct ldlm_lock *new_lock;
- /*
- * Get new lock only for cases when possible resent did not find any
- * lock.
- */
- if (new_lock == NULL)
- new_lock = ldlm_handle2lock_long(&lh->mlh_reg_lh, 0);
+ /* If possible resent found a lock, @lh is set to its handle */
+ new_lock = ldlm_handle2lock_long(&lh->mlh_reg_lh, 0);
if (new_lock == NULL && (flags & LDLM_FL_INTENT_ONLY)) {
lh->mlh_reg_lh.cookie = 0;
*/
LASSERT(lustre_msg_get_flags(req->rq_reqmsg) &
MSG_RESENT);
+
+ LDLM_LOCK_RELEASE(new_lock);
lh->mlh_reg_lh.cookie = 0;
RETURN(ELDLM_LOCK_REPLACED);
}
static void mdt_intent_fixup_resent(struct mdt_thread_info *info,
struct ldlm_lock *new_lock,
- struct ldlm_lock **old_lock,
struct mdt_lock_handle *lh,
- enum mdt_it_code opcode)
+ __u64 flags)
{
struct ptlrpc_request *req = mdt_info_req(info);
- struct obd_export *exp = req->rq_export;
- struct lustre_handle remote_hdl;
struct ldlm_request *dlmreq;
- struct ldlm_lock *lock;
if (!(lustre_msg_get_flags(req->rq_reqmsg) & MSG_RESENT))
return;
dlmreq = req_capsule_client_get(info->mti_pill, &RMF_DLM_REQ);
- remote_hdl = dlmreq->lock_handle[0];
- /* If the client does not require open lock, it does not need to
- * search lock in exp_lock_hash, since the server thread will
- * make sure the lock will be released, and the resend request
- * can always re-enqueue the lock */
- if ((opcode != MDT_IT_OPEN) || (opcode == MDT_IT_OPEN &&
- info->mti_spec.sp_cr_flags & MDS_OPEN_LOCK)) {
- /* In the function below, .hs_keycmp resolves to
- * ldlm_export_lock_keycmp() */
- /* coverity[overrun-buffer-val] */
- lock = cfs_hash_lookup(exp->exp_lock_hash, &remote_hdl);
- if (lock) {
- lock_res_and_lock(lock);
- if (lock != new_lock) {
- lh->mlh_reg_lh.cookie = lock->l_handle.h_cookie;
- lh->mlh_reg_mode = lock->l_granted_mode;
-
- LDLM_DEBUG(lock, "Restoring lock cookie");
- DEBUG_REQ(D_DLMTRACE, req,
- "restoring lock cookie "LPX64,
- lh->mlh_reg_lh.cookie);
- if (old_lock)
- *old_lock = LDLM_LOCK_GET(lock);
- cfs_hash_put(exp->exp_lock_hash,
- &lock->l_exp_hash);
- unlock_res_and_lock(lock);
- return;
- }
- cfs_hash_put(exp->exp_lock_hash, &lock->l_exp_hash);
- unlock_res_and_lock(lock);
- }
+
+ /* Check if this is a resend case (MSG_RESENT is set on RPC) and a
+ * lock was found by ldlm_handle_enqueue(); if so @lh must be
+ * initialized. */
+ if (flags & LDLM_FL_RESENT) {
+ lh->mlh_reg_lh.cookie = new_lock->l_handle.h_cookie;
+ lh->mlh_reg_mode = new_lock->l_granted_mode;
+
+ LDLM_DEBUG(new_lock, "Restoring lock cookie");
+ DEBUG_REQ(D_DLMTRACE, req, "restoring lock cookie "LPX64,
+ lh->mlh_reg_lh.cookie);
+ return;
}
+
/*
* If the xid matches, then we know this is a resent request, and allow
* it. (It's probably an OPEN, for which we don't send a lock.
*/
lustre_msg_clear_flags(req->rq_reqmsg, MSG_RESENT);
- DEBUG_REQ(D_DLMTRACE, req, "no existing lock with rhandle "LPX64,
- remote_hdl.cookie);
+ DEBUG_REQ(D_DLMTRACE, req, "no existing lock with rhandle "LPX64,
+ dlmreq->lock_handle[0].cookie);
}
static int mdt_intent_getxattr(enum mdt_it_code opcode,
* (for the resend case) or a new lock. Below we will use it to
* replace the original lock.
*/
- mdt_intent_fixup_resent(info, *lockp, NULL, lhc, opcode);
+ mdt_intent_fixup_resent(info, *lockp, lhc, flags);
if (!lustre_handle_is_used(&lhc->mlh_reg_lh)) {
mdt_lock_reg_init(lhc, (*lockp)->l_req_mode);
rc = mdt_object_lock(info, info->mti_object, lhc,
grc = mdt_getxattr(info);
- rc = mdt_intent_lock_replace(info, lockp, NULL, lhc, flags);
+ rc = mdt_intent_lock_replace(info, lockp, lhc, flags);
if (mdt_info_req(info)->rq_repmsg != NULL)
ldlm_rep = req_capsule_server_get(info->mti_pill, &RMF_DLM_REP);
__u64 flags)
{
struct mdt_lock_handle *lhc = &info->mti_lh[MDT_LH_RMT];
- struct ldlm_lock *new_lock = NULL;
__u64 child_bits;
struct ldlm_reply *ldlm_rep;
struct mdt_body *reqbody;
repbody = req_capsule_server_get(info->mti_pill, &RMF_MDT_BODY);
LASSERT(repbody);
- info->mti_cross_ref = !!(reqbody->valid & OBD_MD_FLCROSSREF);
- repbody->eadatasize = 0;
- repbody->aclsize = 0;
+ info->mti_cross_ref = !!(reqbody->mbo_valid & OBD_MD_FLCROSSREF);
+ repbody->mbo_eadatasize = 0;
+ repbody->mbo_aclsize = 0;
switch (opcode) {
case MDT_IT_LOOKUP:
mdt_set_disposition(info, ldlm_rep, DISP_IT_EXECD);
/* Get lock from request for possible resent case. */
- mdt_intent_fixup_resent(info, *lockp, &new_lock, lhc, opcode);
+ mdt_intent_fixup_resent(info, *lockp, lhc, flags);
rc = mdt_getattr_name_lock(info, lhc, child_bits, ldlm_rep);
ldlm_rep->lock_policy_res2 = clear_serious(rc);
GOTO(out_ucred, rc = ELDLM_LOCK_ABORTED);
}
- rc = mdt_intent_lock_replace(info, lockp, new_lock, lhc, flags);
+ rc = mdt_intent_lock_replace(info, lockp, lhc, flags);
EXIT;
out_ucred:
mdt_exit_ucred(info);
struct ldlm_lock **lockp,
__u64 flags)
{
+ struct mdt_lock_handle *lhc = &info->mti_lh[MDT_LH_LAYOUT];
struct layout_intent *layout;
struct lu_fid *fid;
struct mdt_object *obj = NULL;
fid = &info->mti_tmp_fid2;
fid_extract_from_res_name(fid, &(*lockp)->l_resource->lr_name);
+ /* Get lock from request for possible resent case. */
+ mdt_intent_fixup_resent(info, *lockp, lhc, flags);
+
obj = mdt_object_find(info->mti_env, info->mti_mdt, fid);
if (IS_ERR(obj))
RETURN(PTR_ERR(obj));
if (mdt_object_exists(obj) && !mdt_object_remote(obj)) {
/* get the length of lsm */
rc = mdt_attr_get_eabuf_size(info, obj);
- if (rc < 0)
+ if (rc < 0) {
+ mdt_object_put(info->mti_env, obj);
RETURN(rc);
+ }
if (rc > info->mti_mdt->mdt_max_mdsize)
info->mti_mdt->mdt_max_mdsize = rc;
if (rc != 0)
RETURN(-EINVAL);
+ if (lustre_handle_is_used(&lhc->mlh_reg_lh))
+ rc = mdt_intent_lock_replace(info, lockp, lhc, flags);
+
layout = req_capsule_client_get(info->mti_pill, &RMF_LAYOUT_INTENT);
LASSERT(layout != NULL);
if (layout->li_opc == LAYOUT_INTENT_ACCESS)
- /* return to normal ldlm handling */
- RETURN(0);
+ /* return to normal/resent ldlm handling */
+ RETURN(rc);
CERROR("%s: Unsupported layout intent (%d)\n",
mdt_obd_name(info->mti_mdt), layout->li_opc);
}
/* Get lock from request for possible resent case. */
- mdt_intent_fixup_resent(info, *lockp, NULL, lhc, opcode);
+ mdt_intent_fixup_resent(info, *lockp, lhc, flags);
rc = mdt_reint_internal(info, lhc, opc);
if (rc == -EREMOTE || mdt_get_disposition(rep, DISP_OPEN_LOCK)) {
LASSERT(lustre_handle_is_used(&lhc->mlh_reg_lh));
rep->lock_policy_res2 = 0;
- rc = mdt_intent_lock_replace(info, lockp, NULL, lhc, flags);
+ rc = mdt_intent_lock_replace(info, lockp, lhc, flags);
RETURN(rc);
}
LASSERTF(rc == 0, "Error occurred but lock handle "
"is still in use, rc = %d\n", rc);
rep->lock_policy_res2 = 0;
- rc = mdt_intent_lock_replace(info, lockp, NULL, lhc, flags);
+ rc = mdt_intent_lock_replace(info, lockp, lhc, flags);
RETURN(rc);
} else {
lhc->mlh_reg_lh.cookie = 0ull;
mdt_done_writing),
TGT_MDT_HDL(HABEO_CORPUS| HABEO_REFERO, MDS_READPAGE, mdt_readpage),
TGT_MDT_HDL(HABEO_CORPUS| HABEO_REFERO, MDS_SYNC, mdt_sync),
-TGT_MDT_HDL(HABEO_CORPUS| HABEO_REFERO, MDS_IS_SUBDIR, mdt_is_subdir),
TGT_MDT_HDL(0, MDS_QUOTACTL, mdt_quotactl),
TGT_MDT_HDL(HABEO_CORPUS| HABEO_REFERO | MUTABOR, MDS_HSM_PROGRESS,
mdt_hsm_progress),
mdt_quota_fini(env, m);
- cfs_free_nidlist(&m->mdt_nosquash_nids);
- if (m->mdt_nosquash_str) {
- OBD_FREE(m->mdt_nosquash_str, m->mdt_nosquash_strlen);
- m->mdt_nosquash_str = NULL;
- m->mdt_nosquash_strlen = 0;
- }
+ cfs_free_nidlist(&m->mdt_squash.rsi_nosquash_nids);
mdt_seq_fini(env, m);
mdt_fld_fini(env, m);
m->mdt_capa_timeout = CAPA_TIMEOUT;
m->mdt_capa_alg = CAPA_HMAC_ALG_SHA1;
m->mdt_ck_timeout = CAPA_KEY_TIMEOUT;
- m->mdt_squash_uid = 0;
- m->mdt_squash_gid = 0;
- CFS_INIT_LIST_HEAD(&m->mdt_nosquash_nids);
- m->mdt_nosquash_str = NULL;
- m->mdt_nosquash_strlen = 0;
- init_rwsem(&m->mdt_squash_sem);
+ m->mdt_squash.rsi_uid = 0;
+ m->mdt_squash.rsi_gid = 0;
+ INIT_LIST_HEAD(&m->mdt_squash.rsi_nosquash_nids);
+ init_rwsem(&m->mdt_squash.rsi_sem);
spin_lock_init(&m->mdt_osfs_lock);
m->mdt_osfs_age = cfs_time_shift_64(-1000);
m->mdt_enable_remote_dir = 0;
switch (cfg->lcfg_command) {
case LCFG_PARAM: {
- struct lprocfs_static_vars lvars;
struct obd_device *obd = d->ld_obd;
/* For interoperability */
}
}
- lprocfs_mdt_init_vars(&lvars);
- rc = class_process_proc_param(PARAM_MDT, lvars.obd_vars,
- cfg, obd);
+ rc = class_process_proc_seq_param(PARAM_MDT, obd->obd_vars,
+ cfg, obd);
if (rc > 0 || rc == -ENOSYS) {
/* is it an HSM var ? */
- rc = class_process_proc_param(PARAM_HSM,
- hsm_cdt_get_proc_vars(),
- cfg, obd);
+ rc = class_process_proc_seq_param(PARAM_HSM,
+ hsm_cdt_get_proc_vars(),
+ cfg, obd);
if (rc > 0 || rc == -ENOSYS)
/* we don't understand; pass it on */
rc = next->ld_ops->ldo_process_config(env, next,
--ptr;
pli->pli_fidcount = 0;
pli->pli_fids[0] = *(struct lu_fid *)mdt_object_fid(pli->pli_mdt_obj);
-
+ *tmpfid = pli->pli_fids[0];
/* root FID only exists on MDT0, and fid2path should also ends at MDT0,
* so checking root_fid can only happen on MDT0. */
while (!lu_fid_eq(&mdt->mdt_md_root_fid,
&pli->pli_fids[pli->pli_fidcount])) {
- mdt_obj = mdt_object_find(info->mti_env, mdt,
- &pli->pli_fids[pli->pli_fidcount]);
+ struct lu_buf lmv_buf;
+
+ mdt_obj = mdt_object_find(info->mti_env, mdt, tmpfid);
if (IS_ERR(mdt_obj))
GOTO(out, rc = PTR_ERR(mdt_obj));
- if (mdt_object_remote(mdt_obj)) {
- mdt_object_put(info->mti_env, mdt_obj);
- GOTO(remote_out, rc = -EREMOTE);
- }
+
if (!mdt_object_exists(mdt_obj)) {
mdt_object_put(info->mti_env, mdt_obj);
GOTO(out, rc = -ENOENT);
}
+ if (mdt_object_remote(mdt_obj)) {
+ mdt_object_put(info->mti_env, mdt_obj);
+ GOTO(remote_out, rc = -EREMOTE);
+ }
+
rc = mdt_links_read(info, mdt_obj, &ldata);
- mdt_object_put(info->mti_env, mdt_obj);
- if (rc != 0)
+ if (rc != 0) {
+ mdt_object_put(info->mti_env, mdt_obj);
GOTO(out, rc);
+ }
leh = buf->lb_buf;
lee = (struct link_ea_entry *)(leh + 1); /* link #0 */
pli->pli_linkno++;
}
+ lmv_buf.lb_buf = info->mti_xattr_buf;
+ lmv_buf.lb_len = sizeof(info->mti_xattr_buf);
+ /* Check if it is slave stripes */
+ rc = mo_xattr_get(info->mti_env, mdt_object_child(mdt_obj),
+ &lmv_buf, XATTR_NAME_LMV);
+ mdt_object_put(info->mti_env, mdt_obj);
+ if (rc > 0) {
+ union lmv_mds_md *lmm = lmv_buf.lb_buf;
+
+ /* For slave stripes, get its master */
+ if (le32_to_cpu(lmm->lmv_magic) == LMV_MAGIC_STRIPE) {
+ pli->pli_fids[pli->pli_fidcount] = *tmpfid;
+ continue;
+ }
+ } else if (rc < 0 && rc != -ENODATA) {
+ GOTO(out, rc);
+ }
+
+ rc = 0;
+
/* Pack the name in the end of the buffer */
ptr -= tmpname->ln_namelen;
if (ptr - 1 <= pli->pli_path)
static int __init mdt_mod_init(void)
{
- struct lprocfs_static_vars lvars;
int rc;
CLASSERT(sizeof("0x0123456789ABCDEF:0x01234567:0x01234567") ==
if (rc)
GOTO(lu_fini, rc);
- lprocfs_mdt_init_vars(&lvars);
rc = class_register_type(&mdt_obd_device_ops, NULL, true, NULL,
#ifndef HAVE_ONLY_PROCFS_SEQ
- lvars.module_vars,
+ NULL,
#endif
LUSTRE_MDT_NAME, &mdt_device_type);
if (rc)
git://git.whamcloud.com / fs / lustre-release.git / blobdiff