if (ret == MDT_IOEPOCH_GETATTR && recovery) {
struct mdt_body *rep;
rep = req_capsule_server_get(info->mti_pill, &RMF_MDT_BODY);
- rep->valid |= OBD_MD_FLGETATTRLOCK;
+ rep->mbo_valid |= OBD_MD_FLGETATTRLOCK;
}
RETURN(rc ? : ret);
if (ma->ma_valid & MA_LOV) {
LASSERT(ma->ma_lmm_size != 0);
- repbody->eadatasize = ma->ma_lmm_size;
- if (isdir)
- repbody->valid |= OBD_MD_FLDIREA;
- else
- repbody->valid |= OBD_MD_FLEASIZE;
- }
+ repbody->mbo_eadatasize = ma->ma_lmm_size;
+ if (isdir)
+ repbody->mbo_valid |= OBD_MD_FLDIREA;
+ else
+ repbody->mbo_valid |= OBD_MD_FLEASIZE;
+ }
if (ma->ma_valid & MA_LMV) {
LASSERT(ma->ma_lmv_size != 0);
- repbody->eadatasize = ma->ma_lmv_size;
+ repbody->mbo_eadatasize = ma->ma_lmv_size;
LASSERT(isdir);
- repbody->valid |= OBD_MD_FLDIREA | OBD_MD_MEA;
+ repbody->mbo_valid |= OBD_MD_FLDIREA | OBD_MD_MEA;
}
- if (flags & FMODE_WRITE) {
- rc = mdt_write_get(o);
- if (rc == 0) {
- mdt_ioepoch_open(info, o, created);
- repbody->ioepoch = o->mot_ioepoch;
+ if (flags & FMODE_WRITE) {
+ rc = mdt_write_get(o);
+ if (rc == 0) {
+ mdt_ioepoch_open(info, o, created);
+ repbody->mbo_ioepoch = o->mot_ioepoch;
}
} else if (flags & MDS_FMODE_EXEC) {
rc = mdt_write_deny(o);
mfd->mfd_old_handle.cookie = info->mti_rr.rr_handle->cookie;
}
- repbody->handle.cookie = mfd->mfd_handle.h_cookie;
+ repbody->mbo_handle.cookie = mfd->mfd_handle.h_cookie;
if (req->rq_export->exp_disconnected) {
spin_lock(&med->med_open_lock);
rc = mdt_pack_remote_perm(info, o, buf);
if (rc) {
- repbody->valid &= ~OBD_MD_FLRMTPERM;
- repbody->aclsize = 0;
- } else {
- repbody->valid |= OBD_MD_FLRMTPERM;
- repbody->aclsize = sizeof(struct mdt_remote_perm);
+ repbody->mbo_valid &= ~OBD_MD_FLRMTPERM;
+ repbody->mbo_aclsize = 0;
+ } else {
+ repbody->mbo_valid |= OBD_MD_FLRMTPERM;
+ repbody->mbo_aclsize = sizeof(struct mdt_remote_perm);
}
}
#ifdef CONFIG_FS_POSIX_ACL
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;
CERROR("got acl size: %d\n", rc);
}
} else {
- repbody->aclsize = rc;
- repbody->valid |= OBD_MD_FLACL;
+ repbody->mbo_aclsize = rc;
+ repbody->mbo_valid |= OBD_MD_FLACL;
rc = 0;
}
}
rc = mo_capa_get(info->mti_env, mdt_object_child(o), capa, 0);
if (rc)
RETURN(rc);
- repbody->valid |= OBD_MD_FLMDSCAPA;
+ repbody->mbo_valid |= OBD_MD_FLMDSCAPA;
}
if (info->mti_mdt->mdt_lut.lut_oss_capa &&
exp_connect_flags(exp) & OBD_CONNECT_OSS_CAPA &&
rc = mo_capa_get(info->mti_env, mdt_object_child(o), capa, 0);
if (rc)
RETURN(rc);
- repbody->valid |= OBD_MD_FLOSSCAPA;
+ repbody->mbo_valid |= OBD_MD_FLOSSCAPA;
}
/*
spin_unlock(&med->med_open_lock);
if (mfd != NULL) {
- repbody->handle.cookie = mfd->mfd_handle.h_cookie;
- /*set repbody->ea_size for resent case*/
- if (ma->ma_valid & MA_LOV) {
- LASSERT(ma->ma_lmm_size != 0);
- repbody->eadatasize = ma->ma_lmm_size;
- if (isdir)
- repbody->valid |= OBD_MD_FLDIREA;
- else
- repbody->valid |= OBD_MD_FLEASIZE;
+ repbody->mbo_handle.cookie = mfd->mfd_handle.h_cookie;
+ /* set repbody->ea_size for resent case */
+ if (ma->ma_valid & MA_LOV) {
+ LASSERT(ma->ma_lmm_size != 0);
+ repbody->mbo_eadatasize = ma->ma_lmm_size;
+ if (isdir)
+ repbody->mbo_valid |= OBD_MD_FLDIREA;
+ else
+ repbody->mbo_valid |= OBD_MD_FLEASIZE;
}
mdt_set_disposition(info, rep, DISP_OPEN_OPEN);
RETURN(0);
mdt_object_put(env, child);
GOTO(out, rc = -EIO);
}
- repbody->fid1 = *rr->rr_fid2;
- repbody->valid |= (OBD_MD_FLID | OBD_MD_MDS);
+ repbody->mbo_fid1 = *rr->rr_fid2;
+ repbody->mbo_valid |= (OBD_MD_FLID | OBD_MD_MDS);
rc = 0;
} else {
if (mdt_object_exists(child)) {
DISP_LOOKUP_EXECD |
DISP_LOOKUP_POS));
repbody = req_capsule_server_get(info->mti_pill, &RMF_MDT_BODY);
- repbody->fid1 = *rr->rr_fid2;
- repbody->valid |= (OBD_MD_FLID | OBD_MD_MDS);
+ repbody->mbo_fid1 = *rr->rr_fid2;
+ repbody->mbo_valid |= (OBD_MD_FLID | OBD_MD_MDS);
rc = 0;
} else {
if (mdt_object_exists(o)) {
/* normal open holds read mode of open sem */
down_read(&obj->mot_open_sem);
- if (open_flags & FMODE_WRITE)
- lm = LCK_CW;
- else if (open_flags & MDS_FMODE_EXEC)
- lm = LCK_PR;
- else
- lm = LCK_CR;
-
if (open_flags & MDS_OPEN_LOCK) {
+ if (open_flags & FMODE_WRITE)
+ lm = LCK_CW;
+ else if (open_flags & MDS_FMODE_EXEC)
+ lm = LCK_PR;
+ else
+ lm = LCK_CR;
+
*ibits = MDS_INODELOCK_LOOKUP | MDS_INODELOCK_OPEN;
- } else if (open_flags & (FMODE_WRITE | MDS_FMODE_EXEC) ||
- atomic_read(&obj->mot_lease_count) > 0) {
- /* We need to flush conflicting locks or revoke a lease.
- * In either case there is no need to acquire a layout
- * lock since it won't be returned to the client. */
- try_layout = false;
+ } else if (atomic_read(&obj->mot_lease_count) > 0) {
+ if (open_flags & FMODE_WRITE)
+ lm = LCK_CW;
+ else
+ lm = LCK_CR;
+
+ /* revoke lease */
*ibits = MDS_INODELOCK_OPEN;
+ try_layout = false;
+
lhc = &info->mti_lh[MDT_LH_LOCAL];
}
-
- CDEBUG(D_INODE, "normal open FID = "DFID", open_count = %d, "
- "lm = %d\n",
- PFID(mdt_object_fid(obj)),
- atomic_read(&obj->mot_open_count), lm);
+ CDEBUG(D_INODE, "normal open:"DFID" lease count: %d, lm: %d\n",
+ PFID(mdt_object_fid(obj)),
+ atomic_read(&obj->mot_open_count), lm);
}
mdt_lock_reg_init(lhc, lm);
ma->ma_need |= MA_PFID;
}
- o = mdt_object_find(env, mdt, rr->rr_fid2);
- if (IS_ERR(o))
- RETURN(rc = PTR_ERR(o));
+ o = mdt_object_find(env, mdt, rr->rr_fid2);
+ if (IS_ERR(o))
+ GOTO(out_parent_put, rc = PTR_ERR(o));
if (mdt_object_remote(o)) {
CDEBUG(D_INFO, "%s: "DFID" is on remote MDT.\n",
if (flags & MDS_OPEN_RELEASE && !mdt_hsm_release_allow(ma))
GOTO(out, rc = -EPERM);
- rc = mdt_object_open_lock(info, o, lhc, &ibits);
- if (rc)
- GOTO(out_unlock, rc);
+ rc = mdt_check_resent_lock(info, o, lhc);
+ if (rc < 0) {
+ GOTO(out, rc);
+ } else if (rc > 0) {
+ rc = mdt_object_open_lock(info, o, lhc, &ibits);
+ if (rc)
+ GOTO(out_unlock, rc);
+ }
if (ma->ma_valid & MA_PFID) {
parent = mdt_object_find(env, mdt, &ma->ma_pfid);
mdt_object_open_unlock(info, o, lhc, ibits, rc);
out:
mdt_object_put(env, o);
+out_parent_put:
if (parent != NULL)
mdt_object_put(env, parent);
return rc;
if (rc != 0)
GOTO(out, rc);
- /* Do not create lov object if the fid is opened
- * under OBF */
- if (S_ISREG(ma->ma_attr.la_mode) &&
- !(ma->ma_valid & MA_LOV) && (flags & FMODE_WRITE) &&
- fid_is_obf(parent_fid))
- GOTO(out, rc = -EPERM);
-
rc = mdt_finish_open(info, NULL, o, flags, 0, rep);
} else {
/*
GOTO(out, result = -EFAULT);
}
CDEBUG(D_INFO, "No object(1), continue as regular open.\n");
- } else if ((!lu_name_is_valid(&rr->rr_name) &&
- (create_flags & MDS_OPEN_LOCK)) ||
- (create_flags & MDS_OPEN_BY_FID)) {
+ } else if (create_flags & (MDS_OPEN_BY_FID | MDS_OPEN_LOCK)) {
+ /*
+ * MDS_OPEN_LOCK is checked for backward compatibility with 2.1
+ * client.
+ */
result = mdt_open_by_fid_lock(info, ldlm_rep, lhc);
- /* If result is 0 then open by FID has found the file
- * and there is nothing left for us to do here. More
- * generally if it is anything other than -ENOENT or
- * -EREMOTE then we return that now. If -ENOENT and
- * MDS_OPEN_CREAT is set then we must create the file
- * below. If -EREMOTE then we need to return a LOOKUP
- * lock to the client, which we do below. Hence this
- * odd looking condition. See LU-2523. */
- if (!(result == -ENOENT && (create_flags & MDS_OPEN_CREAT)) &&
- result != -EREMOTE)
- GOTO(out, result);
-
- CDEBUG(D_INFO, "No object(2), continue as regular open.\n");
+ if (result < 0)
+ CDEBUG(D_INFO, "no object for "DFID": %d\n",
+ PFID(rr->rr_fid2), result);
+ GOTO(out, result);
}
if (OBD_FAIL_CHECK(OBD_FAIL_MDS_OPEN_PACK))
*/
LASSERT(lhc != NULL);
- if (lustre_handle_is_used(&lhc->mlh_reg_lh)) {
- struct ldlm_lock *lock;
-
- LASSERT(msg_flags & MSG_RESENT);
-
- lock = ldlm_handle2lock(&lhc->mlh_reg_lh);
- if (!lock) {
- CERROR("Invalid lock handle "LPX64"\n",
- lhc->mlh_reg_lh.cookie);
- LBUG();
- }
- LASSERT(fid_res_name_eq(mdt_object_fid(child),
- &lock->l_resource->lr_name));
- LDLM_LOCK_PUT(lock);
- rc = 0;
- } else {
+ rc = mdt_check_resent_lock(info, child, lhc);
+ if (rc < 0) {
+ GOTO(out_child, result = rc);
+ } else if (rc > 0) {
mdt_lock_handle_init(lhc);
mdt_lock_reg_init(lhc, LCK_PR);
MDS_INODELOCK_LOOKUP,
MDT_CROSS_LOCK);
}
- repbody->fid1 = *mdt_object_fid(child);
- repbody->valid |= (OBD_MD_FLID | OBD_MD_MDS);
+ repbody->mbo_fid1 = *mdt_object_fid(child);
+ repbody->mbo_valid |= (OBD_MD_FLID | OBD_MD_MDS);
if (rc != 0)
result = rc;
else
}
}
- if (lustre_handle_is_used(&lhc->mlh_reg_lh)) {
+ rc = mdt_check_resent_lock(info, child, lhc);
+ if (rc < 0) {
+ GOTO(out_child, result = rc);
+ } else if (rc == 0) {
/* the open lock might already be gotten in
- * mdt_intent_fixup_resent */
+ * ldlm_handle_enqueue() */
LASSERT(lustre_msg_get_flags(req->rq_reqmsg) & MSG_RESENT);
if (create_flags & MDS_OPEN_LOCK)
mdt_set_disposition(info, ldlm_rep, DISP_OPEN_LOCK);
struct mdt_body *repbody;
repbody = req_capsule_server_get(info->mti_pill, &RMF_MDT_BODY);
LASSERT(repbody != NULL);
- repbody->valid |= OBD_MD_FLRELEASED;
+ repbody->mbo_valid |= OBD_MD_FLRELEASED;
}
out_reprocess:
&RMF_MDT_MD,
RCL_SERVER);
ma->ma_need = MA_INODE | MA_LOV | MA_COOKIE;
- repbody->eadatasize = 0;
- repbody->aclsize = 0;
+ repbody->mbo_eadatasize = 0;
+ repbody->mbo_aclsize = 0;
} else {
rc = err_serious(rc);
}
GOTO(out, rc = err_serious(rc));
repbody = req_capsule_server_get(tsi->tsi_pill, &RMF_MDT_BODY);
- repbody->eadatasize = 0;
- repbody->aclsize = 0;
+ repbody->mbo_eadatasize = 0;
+ repbody->mbo_aclsize = 0;
/* Done Writing may come with the Size-on-MDS update. Unpack it. */
rc = mdt_close_unpack(info);
git://git.whamcloud.com / fs / lustre-release.git / blobdiff