int rc;
ENTRY;
- if ((spec->sp_cr_flags & MDS_OPEN_DELAY_CREATE) ||
- !(spec->sp_cr_flags & FMODE_WRITE))
+ if (!md_should_create(spec->sp_cr_flags))
RETURN(0);
ma->ma_need = MA_INODE | MA_LOV;
{
spin_lock(&info->mti_mdt->mdt_ioepoch_lock);
if (info->mti_epoch->ioepoch == mo->mot_ioepoch) {
- LASSERT(!mdt_epoch_opened(mo));
+ LASSERT(!mdt_epoch_opened(mo));
mo->mot_ioepoch = 0;
mo->mot_flags = 0;
}
int rc = 0;
ENTRY;
- if (!(mdt_conn_flags(info) & OBD_CONNECT_SOM) ||
+ if (!(mdt_conn_flags(info) & OBD_CONNECT_SOM) ||
!S_ISREG(lu_object_attr(&o->mot_obj.mo_lu)))
RETURN(0);
int rc = 0, isdir, isreg;
ENTRY;
- repbody = req_capsule_server_get(&info->mti_pill, &RMF_MDT_BODY);
+ repbody = req_capsule_server_get(info->mti_pill, &RMF_MDT_BODY);
isreg = S_ISREG(la->la_mode);
isdir = S_ISDIR(la->la_mode);
* above attr get, these size might be zero, so reset it, to
* retrieve the MD after create obj.
*/
- ma->ma_lmm_size = req_capsule_get_size(&info->mti_pill,
+ ma->ma_lmm_size = req_capsule_get_size(info->mti_pill,
&RMF_MDT_MD,
RCL_SERVER);
/* in replay case, p == NULL */
/* Check wheather old cookie already exist in
* the list, becasue when do recovery, client
* might be disconnected from server, and
- * restart replay, so there maybe some orphan
+ * restart replay, so there maybe some orphan
* mfd here, we should remove them */
LASSERT(info->mti_rr.rr_handle != NULL);
old_mfd = mdt_handle2mfd(info, info->mti_rr.rr_handle);
LASSERT(ma->ma_valid & MA_INODE);
- repbody = req_capsule_server_get(&info->mti_pill, &RMF_MDT_BODY);
+ repbody = req_capsule_server_get(info->mti_pill, &RMF_MDT_BODY);
isreg = S_ISREG(la->la_mode);
isdir = S_ISDIR(la->la_mode);
mdt_pack_attr2body(info, repbody, la, mdt_object_fid(o));
if (med->med_rmtclient) {
- void *buf = req_capsule_server_get(&info->mti_pill, &RMF_ACL);
+ void *buf = req_capsule_server_get(info->mti_pill, &RMF_ACL);
rc = mdt_pack_remote_perm(info, o, buf);
if (rc) {
struct md_object *next = mdt_object_child(o);
struct lu_buf *buf = &info->mti_buf;
- buf->lb_buf = req_capsule_server_get(&info->mti_pill, &RMF_ACL);
- buf->lb_len = req_capsule_get_size(&info->mti_pill, &RMF_ACL,
+ buf->lb_buf = req_capsule_server_get(info->mti_pill, &RMF_ACL);
+ buf->lb_len = req_capsule_get_size(info->mti_pill, &RMF_ACL,
RCL_SERVER);
if (buf->lb_len > 0) {
rc = mo_xattr_get(env, next, buf,
if (mdt->mdt_opts.mo_mds_capa) {
struct lustre_capa *capa;
- capa = req_capsule_server_get(&info->mti_pill, &RMF_CAPA1);
+ capa = req_capsule_server_get(info->mti_pill, &RMF_CAPA1);
LASSERT(capa);
capa->lc_opc = CAPA_OPC_MDS_DEFAULT;
capa->lc_uid = 0;
if (mdt->mdt_opts.mo_oss_capa &&
S_ISREG(lu_object_attr(&o->mot_obj.mo_lu))) {
struct lustre_capa *capa;
- struct md_ucred *ucred = mdt_ucred(info);
- capa = req_capsule_server_get(&info->mti_pill, &RMF_CAPA2);
+ capa = req_capsule_server_get(info->mti_pill, &RMF_CAPA2);
LASSERT(capa);
capa->lc_opc = CAPA_OPC_OSS_DEFAULT | capa_open_opc(flags);
- capa->lc_uid = ucred->mu_o_fsuid;
+ capa->lc_uid = 0;
rc = mo_capa_get(info->mti_env, mdt_object_child(o), capa, 0);
if (rc)
RETURN(rc);
} else if (flags & MDS_OPEN_DIRECTORY)
RETURN(-ENOTDIR);
- if (MDT_FAIL_CHECK(OBD_FAIL_MDS_OPEN_CREATE)) {
- obd_fail_loc = OBD_FAIL_LDLM_REPLY | OBD_FAIL_ONCE;
+ if (OBD_FAIL_CHECK_RESET(OBD_FAIL_MDS_OPEN_CREATE,
+ OBD_FAIL_LDLM_REPLY | OBD_FAIL_ONCE)) {
RETURN(-EAGAIN);
}
{
const struct lu_env *env = info->mti_env;
struct mdt_device *mdt = info->mti_mdt;
- struct req_capsule *pill = &info->mti_pill;
+ struct req_capsule *pill = info->mti_pill;
struct ptlrpc_request *req = mdt_info_req(info);
struct mdt_export_data *med = &req->rq_export->exp_mdt_data;
struct mdt_client_data *mcd = med->med_mcd;
ldlm_rep->lock_policy_res1, req->rq_status);
if (mdt_get_disposition(ldlm_rep, DISP_OPEN_CREATE) &&
- req->rq_status != 0) {
+ req->rq_status != 0)
/* We did not create successfully, return error to client. */
- mdt_shrink_reply(info);
GOTO(out, rc = req->rq_status);
- }
if (mdt_get_disposition(ldlm_rep, DISP_OPEN_CREATE)) {
/*
}
mdt_object_put(env, parent);
mdt_object_put(env, child);
- mdt_shrink_reply(info);
GOTO(out, rc);
} else {
regular_open:
int rc;
ENTRY;
- LASSERT(info->mti_spec.u.sp_ea.no_lov_create);
o = mdt_object_find(info->mti_env, info->mti_mdt, rr->rr_fid2);
if (IS_ERR(o))
RETURN(rc = PTR_ERR(o));
rc = mo_attr_get(env, mdt_object_child(o), ma);
if (rc == 0)
- rc = mdt_mfd_open(info, NULL, o, flags, 0);
+ rc = mdt_finish_open(info, NULL, o, flags, 0, rep);
} else if (rc == 0) {
rc = -ENOENT;
} else {
/* the child object was created on remote server */
struct mdt_body *repbody;
- repbody = req_capsule_server_get(&info->mti_pill, &RMF_MDT_BODY);
+ repbody = req_capsule_server_get(info->mti_pill, &RMF_MDT_BODY);
repbody->fid1 = *rr->rr_fid2;
repbody->valid |= (OBD_MD_FLID | OBD_MD_MDS);
rc = 0;
int created = 0;
ENTRY;
- OBD_FAIL_TIMEOUT(OBD_FAIL_MDS_PAUSE_OPEN | OBD_FAIL_ONCE,
- (obd_timeout + 1) / 4);
+ OBD_FAIL_TIMEOUT_ORSET(OBD_FAIL_MDS_PAUSE_OPEN, OBD_FAIL_ONCE,
+ (obd_timeout + 1) / 4);
- repbody = req_capsule_server_get(&info->mti_pill, &RMF_MDT_BODY);
+ repbody = req_capsule_server_get(info->mti_pill, &RMF_MDT_BODY);
- ma->ma_lmm = req_capsule_server_get(&info->mti_pill, &RMF_MDT_MD);
- ma->ma_lmm_size = req_capsule_get_size(&info->mti_pill, &RMF_MDT_MD,
+ ma->ma_lmm = req_capsule_server_get(info->mti_pill, &RMF_MDT_MD);
+ ma->ma_lmm_size = req_capsule_get_size(info->mti_pill, &RMF_MDT_MD,
RCL_SERVER);
ma->ma_need = MA_INODE | MA_LOV;
ma->ma_valid = 0;
- LASSERT(info->mti_pill.rc_fmt == &RQF_LDLM_INTENT_OPEN);
- ldlm_rep = req_capsule_server_get(&info->mti_pill, &RMF_DLM_REP);
+ LASSERT(info->mti_pill->rc_fmt == &RQF_LDLM_INTENT_OPEN);
+ ldlm_rep = req_capsule_server_get(info->mti_pill, &RMF_DLM_REP);
/* TODO: JOIN file */
if (create_flags & MDS_OPEN_JOIN_FILE) {
PFID(rr->rr_fid2), create_flags,
ma->ma_attr.la_mode, lustre_msg_get_flags(req->rq_reqmsg));
- if (lustre_msg_get_flags(req->rq_reqmsg) & MSG_REPLAY) {
- /* This is a replay request. */
+ if ((lustre_msg_get_flags(req->rq_reqmsg) & MSG_REPLAY) ||
+ (req->rq_export->exp_libclient && create_flags&MDS_OPEN_HAS_EA)) {
+ /* This is a replay request or from liblustre with ea. */
result = mdt_open_by_fid(info, ldlm_rep);
- if (result != -ENOENT)
+ if (result != -ENOENT) {
+ if (req->rq_export->exp_libclient &&
+ create_flags&MDS_OPEN_HAS_EA)
+ GOTO(out, result = 0);
GOTO(out, result);
-
+ }
/*
* We didn't find the correct object, so we need to re-create it
* via a regular replay.
"regular open\n");
}
- if (MDT_FAIL_CHECK(OBD_FAIL_MDS_OPEN_PACK))
+ if (OBD_FAIL_CHECK(OBD_FAIL_MDS_OPEN_PACK))
GOTO(out, result = err_serious(-ENOMEM));
mdt_set_disposition(info, ldlm_rep,
out_parent:
mdt_object_unlock_put(info, parent, lh, result);
out:
- mdt_shrink_reply(info);
if (result)
lustre_msg_set_transno(req->rq_repmsg, 0);
return result;
mdt_write_allow(info->mti_mdt, o);
} else if (mode & FMODE_EPOCH) {
ret = mdt_epoch_close(info, o);
- }
-
+ }
+
/* Update atime on close only. */
if ((mode & MDS_FMODE_EXEC || mode & FMODE_READ || mode & FMODE_WRITE)
&& (ma->ma_valid & MA_INODE) && (ma->ma_attr.la_valid & LA_ATIME)) {
struct mdt_object *o;
struct md_attr *ma = &info->mti_attr;
struct mdt_body *repbody = NULL;
+ struct ptlrpc_request *req = mdt_info_req(info);
int rc, ret = 0;
ENTRY;
+ if (OBD_FAIL_CHECK_RESET(OBD_FAIL_MDS_CLOSE_NET,
+ OBD_FAIL_MDS_CLOSE_NET)) {
+ info->mti_fail_id = OBD_FAIL_MDS_CLOSE_NET;
+ RETURN(0);
+ }
+
/* Close may come with the Size-on-MDS update. Unpack it. */
rc = mdt_close_unpack(info);
if (rc)
LASSERT(info->mti_epoch);
- req_capsule_set_size(&info->mti_pill, &RMF_MDT_MD, RCL_SERVER,
+ req_capsule_set_size(info->mti_pill, &RMF_MDT_MD, RCL_SERVER,
info->mti_mdt->mdt_max_mdsize);
- req_capsule_set_size(&info->mti_pill, &RMF_LOGCOOKIES, RCL_SERVER,
+ req_capsule_set_size(info->mti_pill, &RMF_LOGCOOKIES, RCL_SERVER,
info->mti_mdt->mdt_max_cookiesize);
- rc = req_capsule_pack(&info->mti_pill);
+ rc = req_capsule_server_pack(info->mti_pill);
+ if (mdt_check_resent(info, mdt_reconstruct_generic, NULL))
+ RETURN(lustre_msg_get_status(req->rq_repmsg));
+
/* Continue to close handle even if we can not pack reply */
if (rc == 0) {
- repbody = req_capsule_server_get(&info->mti_pill,
+ repbody = req_capsule_server_get(info->mti_pill,
&RMF_MDT_BODY);
- ma->ma_lmm = req_capsule_server_get(&info->mti_pill,
+ ma->ma_lmm = req_capsule_server_get(info->mti_pill,
&RMF_MDT_MD);
- ma->ma_lmm_size = req_capsule_get_size(&info->mti_pill,
+ ma->ma_lmm_size = req_capsule_get_size(info->mti_pill,
&RMF_MDT_MD,
RCL_SERVER);
- ma->ma_cookie = req_capsule_server_get(&info->mti_pill,
+ ma->ma_cookie = req_capsule_server_get(info->mti_pill,
&RMF_LOGCOOKIES);
- ma->ma_cookie_size = req_capsule_get_size(&info->mti_pill,
+ ma->ma_cookie_size = req_capsule_get_size(info->mti_pill,
&RMF_LOGCOOKIES,
RCL_SERVER);
ma->ma_need = MA_INODE | MA_LOV | MA_COOKIE;
} else
rc = err_serious(rc);
- med = &mdt_info_req(info)->rq_export->exp_mdt_data;
+ med = &req->rq_export->exp_mdt_data;
spin_lock(&med->med_open_lock);
mfd = mdt_handle2mfd(info, &info->mti_epoch->handle);
if (mdt_mfd_closed(mfd)) {
if (repbody != NULL)
mdt_shrink_reply(info);
- if (MDT_FAIL_CHECK(OBD_FAIL_MDS_CLOSE_PACK))
+ if (OBD_FAIL_CHECK(OBD_FAIL_MDS_CLOSE_PACK))
RETURN(err_serious(-ENOMEM));
+ if (OBD_FAIL_CHECK_RESET(OBD_FAIL_MDS_CLOSE_NET_REP,
+ OBD_FAIL_MDS_CLOSE_NET_REP))
+ info->mti_fail_id = OBD_FAIL_MDS_CLOSE_NET_REP;
RETURN(rc ? rc : ret);
}
int mdt_done_writing(struct mdt_thread_info *info)
{
struct mdt_body *repbody = NULL;
- struct ptlrpc_request *req = mdt_info_req(info);
struct mdt_export_data *med;
struct mdt_file_data *mfd;
int rc;
ENTRY;
- rc = req_capsule_pack(&info->mti_pill);
+ rc = req_capsule_server_pack(info->mti_pill);
if (rc)
RETURN(err_serious(rc));
- repbody = req_capsule_server_get(&info->mti_pill,
+ repbody = req_capsule_server_get(info->mti_pill,
&RMF_MDT_BODY);
repbody->eadatasize = 0;
repbody->aclsize = 0;
if (rc)
RETURN(err_serious(rc));
+ if (mdt_check_resent(info, mdt_reconstruct_generic, NULL))
+ RETURN(lustre_msg_get_status(mdt_info_req(info)->rq_repmsg));
+
med = &info->mti_exp->exp_mdt_data;
spin_lock(&med->med_open_lock);
mfd = mdt_handle2mfd(info, &info->mti_epoch->handle);
": cookie = "LPX64"\n", PFID(info->mti_rr.rr_fid1),
info->mti_epoch->handle.cookie);
RETURN(-ESTALE);
- }
-
- if (!(mfd->mfd_mode == FMODE_EPOCH ||
- mfd->mfd_mode == FMODE_EPOCHLCK)) {
- spin_unlock(&med->med_open_lock);
- DEBUG_REQ(D_WARNING, req, "req should be resent req");
- LASSERT(mfd->mfd_mode == FMODE_SOM);
- LASSERT(lustre_msg_get_flags(req->rq_reqmsg) &
- (MSG_RESENT | MSG_REPLAY));
- /*Since we did not bond this req with open/close,
- *Why we should keep this req as replay req XXX*/
- GOTO(empty_transno, rc);
}
+
+ LASSERT(mfd->mfd_mode == FMODE_EPOCH ||
+ mfd->mfd_mode == FMODE_EPOCHLCK);
class_handle_unhash(&mfd->mfd_handle);
list_del_init(&mfd->mfd_list);
spin_unlock(&med->med_open_lock);
info->mti_epoch->flags |= MF_EPOCH_CLOSE;
info->mti_attr.ma_valid = 0;
rc = mdt_mfd_close(info, mfd);
-empty_transno:
mdt_empty_transno(info);
RETURN(rc);
}
git://git.whamcloud.com / fs / lustre-release.git / blobdiff