RETURN(rc);
}
-extern void mdt_req_from_mcd(struct ptlrpc_request *req,
- struct mdt_client_data *mcd);
+extern void mdt_req_from_lcd(struct ptlrpc_request *req,
+ struct lsd_client_data *lcd);
void mdt_reconstruct_open(struct mdt_thread_info *info,
struct mdt_lock_handle *lhc)
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;
+ struct lsd_client_data *lcd = med->med_lcd;
struct md_attr *ma = &info->mti_attr;
struct mdt_reint_record *rr = &info->mti_rr;
__u32 flags = info->mti_spec.sp_cr_flags;
ma->ma_need = MA_INODE | MA_LOV;
ma->ma_valid = 0;
- mdt_req_from_mcd(req, med->med_mcd);
- mdt_set_disposition(info, ldlm_rep, mcd->mcd_last_data);
+ mdt_req_from_lcd(req, med->med_lcd);
+ mdt_set_disposition(info, ldlm_rep, lcd->lcd_last_data);
CERROR("This is reconstruct open: disp="LPX64", result=%d\n",
ldlm_rep->lock_policy_res1, req->rq_status);
GOTO(out, rc = req->rq_status);
if (mdt_get_disposition(ldlm_rep, DISP_OPEN_CREATE)) {
+ struct obd_export *exp = req->rq_export;
/*
* We failed after creation, but we do not know in which step
* we failed. So try to check the child object.
*/
parent = mdt_object_find(env, mdt, rr->rr_fid1);
- LASSERT(!IS_ERR(parent));
-
+ if (IS_ERR(parent)) {
+ rc = PTR_ERR(parent);
+ LCONSOLE_WARN("Parent "DFID" lookup error %d."
+ " Evicting client %s with export %s.\n",
+ PFID(mdt_object_fid(parent)), rc,
+ obd_uuid2str(&exp->exp_client_uuid),
+ obd_export_nid2str(exp));
+ mdt_export_evict(exp);
+ EXIT;
+ return;
+ }
child = mdt_object_find(env, mdt, rr->rr_fid2);
- LASSERT(!IS_ERR(child));
-
+ if (IS_ERR(child)) {
+ rc = PTR_ERR(parent);
+ LCONSOLE_WARN("Child "DFID" lookup error %d."
+ " Evicting client %s with export %s.\n",
+ PFID(mdt_object_fid(child)), rc,
+ obd_uuid2str(&exp->exp_client_uuid),
+ obd_export_nid2str(exp));
+ mdt_export_evict(exp);
+ EXIT;
+ return;
+ }
rc = mdt_object_exists(child);
if (rc > 0) {
struct md_object *next;
__u32 create_flags = info->mti_spec.sp_cr_flags;
struct mdt_reint_record *rr = &info->mti_rr;
struct lu_name *lname;
- int result;
+ int result, rc;
int created = 0;
+ __u32 msg_flags;
ENTRY;
OBD_FAIL_TIMEOUT_ORSET(OBD_FAIL_MDS_PAUSE_OPEN, OBD_FAIL_ONCE,
CERROR("JOIN file will be supported soon\n");
GOTO(out, result = err_serious(-EOPNOTSUPP));
}
+ msg_flags = lustre_msg_get_flags(req->rq_reqmsg);
CDEBUG(D_INODE, "I am going to open "DFID"/(%s->"DFID") "
"cr_flag=0%o mode=0%06o msg_flag=0x%x\n",
PFID(rr->rr_fid1), rr->rr_name,
PFID(rr->rr_fid2), create_flags,
- ma->ma_attr.la_mode, lustre_msg_get_flags(req->rq_reqmsg));
+ ma->ma_attr.la_mode, msg_flags);
- if ((lustre_msg_get_flags(req->rq_reqmsg) & MSG_REPLAY) ||
+ if (msg_flags & 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);
* The object is on remote node, return its FID for remote open.
*/
if (result == -EREMOTE) {
- int rc;
-
/*
* Check if this lock already was sent to client and
* this is resent case. For resent case do not take lock
if (lustre_handle_is_used(&lhc->mlh_reg_lh)) {
struct ldlm_lock *lock;
- LASSERT(lustre_msg_get_flags(req->rq_reqmsg) &
- MSG_RESENT);
+ LASSERT(msg_flags & MSG_RESENT);
lock = ldlm_handle2lock(&lhc->mlh_reg_lh);
if (!lock) {
}
}
+ LASSERT(!lustre_handle_is_used(&lhc->mlh_reg_lh));
+
+ /* get openlock if this is not replay and if a client requested it */
+ if (!(msg_flags & MSG_REPLAY) && create_flags & MDS_OPEN_LOCK) {
+ ldlm_mode_t lm;
+
+ LASSERT(!created);
+ if (create_flags & FMODE_WRITE)
+ lm = LCK_CW;
+ else if (create_flags & MDS_FMODE_EXEC)
+ lm = LCK_PR;
+ else
+ lm = LCK_CR;
+ mdt_lock_handle_init(lhc);
+ mdt_lock_reg_init(lhc, lm);
+ rc = mdt_object_lock(info, child, lhc,
+ MDS_INODELOCK_LOOKUP | MDS_INODELOCK_OPEN,
+ MDT_CROSS_LOCK);
+ if (rc) {
+ result = rc;
+ GOTO(out_child, result);
+ } else {
+ result = -EREMOTE;
+ mdt_set_disposition(info, ldlm_rep, DISP_OPEN_LOCK);
+ }
+ }
+
/* Try to open it now. */
- result = mdt_finish_open(info, parent, child, create_flags,
- created, ldlm_rep);
-
- if (result != 0 && created) {
- int rc2;
- ma->ma_need = 0;
- ma->ma_valid = 0;
- ma->ma_cookie_size = 0;
- info->mti_no_need_trans = 1;
- rc2 = mdo_unlink(info->mti_env,
- mdt_object_child(parent),
- mdt_object_child(child),
- lname,
- &info->mti_attr);
- if (rc2 != 0)
- CERROR("Error in cleanup of open\n");
+ rc = mdt_finish_open(info, parent, child, create_flags,
+ created, ldlm_rep);
+ if (rc) {
+ result = rc;
+ if (lustre_handle_is_used(&lhc->mlh_reg_lh))
+ /* openlock was acquired and mdt_finish_open failed -
+ drop the openlock */
+ mdt_object_unlock(info, child, lhc, 1);
+ if (created) {
+ ma->ma_need = 0;
+ ma->ma_valid = 0;
+ ma->ma_cookie_size = 0;
+ info->mti_no_need_trans = 1;
+ rc = mdo_unlink(info->mti_env,
+ mdt_object_child(parent),
+ mdt_object_child(child),
+ lname,
+ &info->mti_attr);
+ if (rc != 0)
+ CERROR("Error in cleanup of open\n");
+ }
}
EXIT;
out_child:
out_parent:
mdt_object_unlock_put(info, parent, lh, result);
out:
- if (result)
+ if (result && result != -EREMOTE)
lustre_msg_set_transno(req->rq_repmsg, 0);
return result;
}
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)
git://git.whamcloud.com / fs / lustre-release.git / blobdiff