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;
struct seq_server_site *ss;
struct lu_ucred *uc = mdt_ucred(info);
- if (!md_capable(uc, CAP_SYS_ADMIN)) {
+ if (!md_capable(uc, CFS_CAP_SYS_ADMIN)) {
if (uc->uc_gid !=
mdt->mdt_enable_remote_dir_gid &&
mdt->mdt_enable_remote_dir_gid != -1) {
OBD_FAIL_MDS_REINT_CREATE_WRITE);
/* Version of child will be updated on disk. */
- info->mti_mos = child;
+ tgt_vbr_obj_set(info->mti_env, mdt_obj2dt(child));
rc = mdt_version_get_check_save(info, child, 2);
if (rc)
GOTO(out_put_child, rc);
/* VBR: update version if attr changed are important for recovery */
if (do_vbr) {
/* update on-disk version of changed object */
- info->mti_mos = mo;
+ tgt_vbr_obj_set(info->mti_env, mdt_obj2dt(mo));
rc = mdt_version_get_check_save(info, mo, 0);
if (rc)
GOTO(out_unlock, 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) {
if (info->mti_spec.sp_rm_entry) {
struct lu_ucred *uc = mdt_ucred(info);
- if (!md_capable(uc, CAP_SYS_ADMIN)) {
+ if (!md_capable(uc, CFS_CAP_SYS_ADMIN)) {
CERROR("%s: unlink remote entry is only "
"permitted for administrator: rc = %d\n",
mdt_obd_name(info->mti_mdt),
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);
/* save version when object is locked */
mdt_version_get_save(info, mc, 1);
- /*
- * Now we can only make sure we need MA_INODE, in mdd layer, will check
- * whether need MA_LOV and MA_COOKIE.
- */
- ma->ma_need = MA_INODE;
- ma->ma_valid = 0;
- mdt_set_capainfo(info, 1, child_fid, BYPASS_CAPA);
+ /*
+ * Now we can only make sure we need MA_INODE, in mdd layer, will check
+ * whether need MA_LOV and MA_COOKIE.
+ */
+ ma->ma_need = MA_INODE;
+ ma->ma_valid = 0;
+ mdt_set_capainfo(info, 1, child_fid, BYPASS_CAPA);
+
+ mutex_lock(&mc->mot_lov_mutex);
rc = mdo_unlink(info->mti_env, mdt_object_child(mp),
mdt_object_child(mc), lname, ma, no_name);
+
+ mutex_unlock(&mc->mot_lov_mutex);
+
if (rc == 0 && !lu_object_is_dying(&mc->mot_header))
rc = mdt_attr_get_complex(info, mc, ma);
if (rc == 0)
mdt_fail_write(info->mti_env, info->mti_mdt->mdt_bottom,
OBD_FAIL_MDS_REINT_LINK_WRITE);
- info->mti_mos = ms;
+ tgt_vbr_obj_set(info->mti_env, mdt_obj2dt(ms));
rc = mdt_version_get_check_save(info, ms, 1);
if (rc)
GOTO(out_unlock_child, rc);
GOTO(out_unlock_target, rc);
}
- info->mti_mos = mold;
+ tgt_vbr_obj_set(info->mti_env, mdt_obj2dt(mold));
/* save version after locking */
mdt_version_get_save(info, mold, 2);
mdt_set_capainfo(info, 2, old_fid, BYPASS_CAPA);
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);
mdt_fail_write(info->mti_env, info->mti_mdt->mdt_bottom,
OBD_FAIL_MDS_REINT_RENAME_WRITE);
+ /* Check if @dst is subdir of @src. */
+ rc = mdt_rename_sanity(info, old_fid);
+ if (rc)
+ GOTO(out_unlock_new, rc);
- /* Check if @dst is subdir of @src. */
- rc = mdt_rename_sanity(info, old_fid);
- if (rc)
- GOTO(out_unlock_new, rc);
+ if (mnew != NULL)
+ mutex_lock(&mnew->mot_lov_mutex);
- rc = mdo_rename(info->mti_env, mdt_object_child(msrcdir),
- mdt_object_child(mtgtdir), old_fid, &slname,
- (mnew ? mdt_object_child(mnew) : NULL),
- lname, ma);
+ rc = mdo_rename(info->mti_env, mdt_object_child(msrcdir),
+ mdt_object_child(mtgtdir), old_fid, &slname,
+ (mnew ? mdt_object_child(mnew) : NULL),
+ lname, ma);
- /* handle last link of tgt object */
- if (rc == 0) {
+ if (mnew != NULL)
+ mutex_unlock(&mnew->mot_lov_mutex);
+
+ /* handle last link of tgt object */
+ if (rc == 0) {
mdt_counter_incr(req, LPROC_MDT_RENAME);
- if (mnew)
- mdt_handle_last_unlink(info, mnew, ma);
+ if (mnew)
+ mdt_handle_last_unlink(info, mnew, ma);
mdt_rename_counter_tally(info, info->mti_mdt, req,
msrcdir, mtgtdir);
git://git.whamcloud.com / fs / lustre-release.git / blobdiff