if (repbody->valid & OBD_MD_FLMDSCAPA)
RETURN(rc);
- if (rc == 0 && info->mti_mdt->mdt_opts.mo_mds_capa &&
+ if (rc == 0 && info->mti_mdt->mdt_lut.lut_mds_capa &&
exp_connect_flags(info->mti_exp) & OBD_CONNECT_MDS_CAPA) {
struct lustre_capa *capa;
/* If an up2date copy exists in the backend, add dirty flag */
if ((ma->ma_valid & MA_HSM) && (ma->ma_hsm.mh_flags & HS_EXISTS)
&& !(ma->ma_hsm.mh_flags & (HS_DIRTY|HS_RELEASED))) {
+ struct mdt_lock_handle *lh = &info->mti_lh[MDT_LH_CHILD];
ma->ma_hsm.mh_flags |= HS_DIRTY;
+
+ mdt_lock_reg_init(lh, LCK_PW);
+ rc = mdt_object_lock(info, mo, lh, MDS_INODELOCK_XATTR,
+ MDT_LOCAL_LOCK);
+ if (rc != 0)
+ RETURN(rc);
+
rc = mdt_hsm_attr_set(info, mo, &ma->ma_hsm);
- if (rc) {
+ if (rc)
CERROR("file attribute change error for "DFID": %d\n",
PFID(mdt_object_fid(mo)), rc);
- RETURN(rc);
- }
+ mdt_object_unlock(info, mo, lh, rc);
}
RETURN(rc);
ma->ma_need = MA_INODE;
ma->ma_valid = 0;
rc = mdt_attr_get_complex(info, mo, ma);
- if (rc != 0)
- GOTO(out_put, rc);
+ if (rc != 0)
+ GOTO(out_put, rc);
- mdt_pack_attr2body(info, repbody, &ma->ma_attr, mdt_object_fid(mo));
+ mdt_pack_attr2body(info, repbody, &ma->ma_attr, mdt_object_fid(mo));
- 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 &&
S_ISREG(lu_object_attr(&mo->mot_obj)) &&
(ma->ma_attr.la_valid & LA_SIZE) && !som_au) {
GOTO(put_child, rc);
}
- rc = mdt_object_lock(info, mc, child_lh, MDS_INODELOCK_FULL,
- MDT_CROSS_LOCK);
- if (rc != 0) {
+ /* We used to acquire MDS_INODELOCK_FULL here but we can't do
+ * this now because a running HSM restore on the child (unlink
+ * victim) will hold the layout lock. See LU-4002. */
+ rc = mdt_object_lock(info, mc, child_lh,
+ MDS_INODELOCK_LOOKUP | MDS_INODELOCK_UPDATE,
+ MDT_CROSS_LOCK);
+ if (rc != 0)
GOTO(put_child, rc);
- }
mdt_fail_write(info->mti_env, info->mti_mdt->mdt_bottom,
OBD_FAIL_MDS_REINT_UNLINK_WRITE);
GOTO(out_unlock_parent, rc = -EXDEV);
}
- rc = mdt_object_lock(info, ms, lhs, MDS_INODELOCK_UPDATE,
- MDT_CROSS_LOCK);
+ rc = mdt_object_lock(info, ms, lhs, MDS_INODELOCK_UPDATE |
+ MDS_INODELOCK_XATTR, MDT_CROSS_LOCK);
if (rc != 0) {
mdt_object_put(info->mti_env, ms);
GOTO(out_unlock_parent, rc);
lh_oldp = &info->mti_lh[MDT_LH_OLD];
mdt_lock_reg_init(lh_oldp, LCK_EX);
- rc = mdt_object_lock(info, mold, lh_oldp, MDS_INODELOCK_LOOKUP,
- MDT_CROSS_LOCK);
+ rc = mdt_object_lock(info, mold, lh_oldp, MDS_INODELOCK_LOOKUP |
+ MDS_INODELOCK_XATTR, MDT_CROSS_LOCK);
if (rc != 0) {
mdt_object_put(info->mti_env, mold);
GOTO(out_unlock_target, rc);
GOTO(out_unlock_old, rc = -EXDEV);
}
- rc = mdt_object_lock(info, mnew, lh_newp,
- MDS_INODELOCK_FULL, MDT_CROSS_LOCK);
+ /* We used to acquire MDS_INODELOCK_FULL here but we
+ * can't do this now because a running HSM restore on
+ * the rename onto victim will hold the layout
+ * lock. See LU-4002. */
+ rc = mdt_object_lock(info, mnew, lh_newp,
+ MDS_INODELOCK_LOOKUP |
+ MDS_INODELOCK_UPDATE,
+ MDT_CROSS_LOCK);
if (rc != 0) {
mdt_object_put(info->mti_env, mnew);
GOTO(out_unlock_old, rc);