X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fmdt%2Fmdt_open.c;h=4aacc8c3647a84fcac749ce43f685ffe048d21d5;hb=48d9e119238fd0c54ff8b6a53f7bfed9d5750a24;hp=30c80e7dd172ce84716b40db049c490bd905812b;hpb=78e16f885cd76bfe8e2ed3d2a15995959eee7a6f;p=fs%2Flustre-release.git diff --git a/lustre/mdt/mdt_open.c b/lustre/mdt/mdt_open.c index 30c80e7..4aacc8c 100644 --- a/lustre/mdt/mdt_open.c +++ b/lustre/mdt/mdt_open.c @@ -65,9 +65,9 @@ struct mdt_file_data *mdt_mfd_new(const struct mdt_export_data *med) OBD_ALLOC_PTR(mfd); if (mfd != NULL) { - CFS_INIT_LIST_HEAD(&mfd->mfd_handle.h_link); + INIT_LIST_HEAD(&mfd->mfd_handle.h_link); mfd->mfd_handle.h_owner = med; - CFS_INIT_LIST_HEAD(&mfd->mfd_list); + INIT_LIST_HEAD(&mfd->mfd_list); class_handle_hash(&mfd->mfd_handle, &mfd_handle_ops); } @@ -91,7 +91,7 @@ struct mdt_file_data *mdt_handle2mfd(struct mdt_export_data *med, mfd = class_handle2object(handle->cookie, med); /* during dw/setattr replay the mfd can be found by old handle */ if (mfd == NULL && is_replay_or_resent) { - cfs_list_for_each_entry(mfd, &med->med_open_head, mfd_list) { + list_for_each_entry(mfd, &med->med_open_head, mfd_list) { if (mfd->mfd_old_handle.cookie == handle->cookie) RETURN(mfd); } @@ -104,8 +104,8 @@ struct mdt_file_data *mdt_handle2mfd(struct mdt_export_data *med, /* free mfd */ void mdt_mfd_free(struct mdt_file_data *mfd) { - LASSERT(cfs_list_empty(&mfd->mfd_list)); - OBD_FREE_RCU(mfd, sizeof *mfd, &mfd->mfd_handle); + LASSERT(list_empty(&mfd->mfd_list)); + OBD_FREE_RCU(mfd, sizeof *mfd, &mfd->mfd_handle); } static int mdt_create_data(struct mdt_thread_info *info, @@ -123,10 +123,6 @@ static int mdt_create_data(struct mdt_thread_info *info, ma->ma_valid = 0; mutex_lock(&o->mot_lov_mutex); if (!(o->mot_flags & MOF_LOV_CREATED)) { - if (p != NULL && (fid_is_obf(mdt_object_fid(p)) || - fid_is_dot_lustre(mdt_object_fid(p)))) - GOTO(unlock, rc = -EPERM); - rc = mdo_create_data(info->mti_env, p ? mdt_object_child(p) : NULL, mdt_object_child(o), spec, ma); @@ -136,7 +132,7 @@ static int mdt_create_data(struct mdt_thread_info *info, if (rc == 0 && ma->ma_valid & MA_LOV) o->mot_flags |= MOF_LOV_CREATED; } -unlock: + mutex_unlock(&o->mot_lov_mutex); RETURN(rc); } @@ -419,7 +415,7 @@ static inline int mdt_ioepoch_close_reg(struct mdt_thread_info *info, 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); @@ -663,6 +659,33 @@ void mdt_mfd_set_mode(struct mdt_file_data *mfd, __u64 mode) mfd->mfd_mode = mode; } +/** + * prep ma_lmm/ma_lmv for md_attr from reply + */ +void mdt_prep_ma_buf_from_rep(struct mdt_thread_info *info, + struct mdt_object *obj, + struct md_attr *ma) +{ + LASSERT(ma->ma_lmv == NULL && ma->ma_lmm == NULL); + if (S_ISDIR(obj->mot_header.loh_attr)) { + ma->ma_lmv = req_capsule_server_get(info->mti_pill, + &RMF_MDT_MD); + ma->ma_lmv_size = req_capsule_get_size(info->mti_pill, + &RMF_MDT_MD, + RCL_SERVER); + if (ma->ma_lmv_size > 0) + ma->ma_need |= MA_LMV; + } else { + 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); + if (ma->ma_lmm_size > 0) + ma->ma_need |= MA_LOV; + } +} + static int mdt_mfd_open(struct mdt_thread_info *info, struct mdt_object *p, struct mdt_object *o, __u64 flags, int created, struct ldlm_reply *rep) @@ -703,18 +726,25 @@ static int mdt_mfd_open(struct mdt_thread_info *info, struct mdt_object *p, 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 (flags & FMODE_WRITE) { - rc = mdt_write_get(o); - if (rc == 0) { - mdt_ioepoch_open(info, o, created); - repbody->ioepoch = o->mot_ioepoch; + if (ma->ma_valid & MA_LMV) { + LASSERT(ma->ma_lmv_size != 0); + repbody->mbo_eadatasize = ma->ma_lmv_size; + LASSERT(isdir); + 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->mbo_ioepoch = o->mot_ioepoch; } } else if (flags & MDS_FMODE_EXEC) { rc = mdt_write_deny(o); @@ -769,7 +799,7 @@ static int mdt_mfd_open(struct mdt_thread_info *info, struct mdt_object *p, PFID(mdt_object_fid(mfd->mfd_object)), info->mti_rr.rr_handle->cookie); class_handle_unhash(&old_mfd->mfd_handle); - cfs_list_del_init(&old_mfd->mfd_list); + list_del_init(&old_mfd->mfd_list); spin_unlock(&med->med_open_lock); /* no attr update for that close */ la->la_valid = 0; @@ -792,17 +822,17 @@ static int mdt_mfd_open(struct mdt_thread_info *info, struct mdt_object *p, 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); class_handle_unhash(&mfd->mfd_handle); - cfs_list_del_init(&mfd->mfd_list); + list_del_init(&mfd->mfd_list); spin_unlock(&med->med_open_lock); mdt_mfd_close(info, mfd); } else { spin_lock(&med->med_open_lock); - cfs_list_add(&mfd->mfd_list, &med->med_open_head); + list_add(&mfd->mfd_list, &med->med_open_head); spin_unlock(&med->med_open_lock); } @@ -811,30 +841,31 @@ static int mdt_mfd_open(struct mdt_thread_info *info, struct mdt_object *p, RETURN(rc); err_out: - if (flags & FMODE_WRITE) - /* XXX We also need to close io epoch here. - * See LU-1220 - green */ - mdt_write_put(o); - else if (flags & FMODE_EXEC) - mdt_write_allow(o); - return rc; + if (flags & FMODE_WRITE) + /* XXX We also need to close io epoch here. + * See LU-1220 - green */ + mdt_write_put(o); + else if (flags & MDS_FMODE_EXEC) + mdt_write_allow(o); + + return rc; } int mdt_finish_open(struct mdt_thread_info *info, struct mdt_object *p, struct mdt_object *o, __u64 flags, int created, struct ldlm_reply *rep) { - struct ptlrpc_request *req = mdt_info_req(info); - struct obd_export *exp = req->rq_export; - struct mdt_export_data *med = &req->rq_export->exp_mdt_data; - struct md_attr *ma = &info->mti_attr; - struct lu_attr *la = &ma->ma_attr; - struct mdt_file_data *mfd; - struct mdt_body *repbody; - int rc = 0; - int isreg, isdir, islnk; - cfs_list_t *t; - ENTRY; + struct ptlrpc_request *req = mdt_info_req(info); + struct obd_export *exp = req->rq_export; + struct mdt_export_data *med = &req->rq_export->exp_mdt_data; + struct md_attr *ma = &info->mti_attr; + struct lu_attr *la = &ma->ma_attr; + struct mdt_file_data *mfd; + struct mdt_body *repbody; + int rc = 0; + int isreg, isdir, islnk; + struct list_head *t; + ENTRY; LASSERT(ma->ma_valid & MA_INODE); @@ -865,11 +896,11 @@ int mdt_finish_open(struct mdt_thread_info *info, 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 @@ -886,8 +917,8 @@ int mdt_finish_open(struct mdt_thread_info *info, 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; @@ -895,8 +926,8 @@ int mdt_finish_open(struct mdt_thread_info *info, 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; } } @@ -913,7 +944,7 @@ int mdt_finish_open(struct mdt_thread_info *info, 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 && @@ -926,7 +957,7 @@ int mdt_finish_open(struct mdt_thread_info *info, 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; } /* @@ -960,11 +991,11 @@ int mdt_finish_open(struct mdt_thread_info *info, RETURN(-EAGAIN); } - mfd = NULL; - if (lustre_msg_get_flags(req->rq_reqmsg) & MSG_RESENT) { + mfd = NULL; + if (lustre_msg_get_flags(req->rq_reqmsg) & MSG_RESENT) { spin_lock(&med->med_open_lock); - cfs_list_for_each(t, &med->med_open_head) { - mfd = cfs_list_entry(t, struct mdt_file_data, mfd_list); + list_for_each(t, &med->med_open_head) { + mfd = list_entry(t, struct mdt_file_data, mfd_list); if (mfd->mfd_xid == req->rq_xid) break; mfd = NULL; @@ -972,15 +1003,15 @@ int mdt_finish_open(struct mdt_thread_info *info, 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); @@ -1020,13 +1051,7 @@ void mdt_reconstruct_open(struct mdt_thread_info *info, ldlm_rep = req_capsule_server_get(pill, &RMF_DLM_REP); repbody = req_capsule_server_get(pill, &RMF_MDT_BODY); - ma->ma_lmm = req_capsule_server_get(pill, &RMF_MDT_MD); - ma->ma_lmm_size = req_capsule_get_size(pill, &RMF_MDT_MD, - RCL_SERVER); ma->ma_need = MA_INODE | MA_HSM; - if (ma->ma_lmm_size > 0) - ma->ma_need |= MA_LOV; - ma->ma_valid = 0; mdt_req_from_lcd(req, lcd); @@ -1057,18 +1082,19 @@ void mdt_reconstruct_open(struct mdt_thread_info *info, mdt_export_evict(exp); RETURN_EXIT; } - child = mdt_object_find(env, mdt, rr->rr_fid2); - if (IS_ERR(child)) { - rc = PTR_ERR(child); - 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_object_put(env, parent); - mdt_export_evict(exp); - RETURN_EXIT; - } + + child = mdt_object_find(env, mdt, rr->rr_fid2); + if (IS_ERR(child)) { + rc = PTR_ERR(child); + LCONSOLE_WARN("cannot lookup child "DFID": rc = %d; " + "evicting client %s with export %s\n", + PFID(rr->rr_fid2), rc, + obd_uuid2str(&exp->exp_client_uuid), + obd_export_nid2str(exp)); + mdt_object_put(env, parent); + mdt_export_evict(exp); + RETURN_EXIT; + } if (unlikely(mdt_object_remote(child))) { /* the child object was created on remote server */ @@ -1078,13 +1104,14 @@ void mdt_reconstruct_open(struct mdt_thread_info *info, 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)) { mdt_set_capainfo(info, 1, rr->rr_fid2, BYPASS_CAPA); + mdt_prep_ma_buf_from_rep(info, child, ma); rc = mdt_attr_get_complex(info, child, ma); if (rc == 0) rc = mdt_finish_open(info, parent, @@ -1135,15 +1162,15 @@ int mdt_open_by_fid(struct mdt_thread_info *info, struct ldlm_reply *rep) 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)) { mdt_set_disposition(info, rep, (DISP_IT_EXECD | DISP_LOOKUP_EXECD | DISP_LOOKUP_POS)); - + mdt_prep_ma_buf_from_rep(info, o, ma); rc = mdt_attr_get_complex(info, o, ma); if (rc == 0) rc = mdt_finish_open(info, NULL, o, flags, 0, @@ -1365,7 +1392,7 @@ static void mdt_object_open_unlock(struct mdt_thread_info *info, up_read(&obj->mot_open_sem); /* Cross-ref case, the lock should be returned to the client */ - if (ibits == 0 || rc == -EREMOTE) + if (ibits == 0 || rc == -MDT_EREMOTE_OPEN) RETURN_EXIT; if (!(open_flags & MDS_OPEN_LOCK) && !(ibits & MDS_INODELOCK_LAYOUT)) { @@ -1413,6 +1440,7 @@ int mdt_open_by_fid_lock(struct mdt_thread_info *info, struct ldlm_reply *rep, struct mdt_object *parent= NULL; struct mdt_object *o; int rc; + int object_locked = 0; __u64 ibits = 0; ENTRY; @@ -1431,9 +1459,9 @@ int mdt_open_by_fid_lock(struct mdt_thread_info *info, struct ldlm_reply *rep, 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", @@ -1450,6 +1478,7 @@ int mdt_open_by_fid_lock(struct mdt_thread_info *info, struct ldlm_reply *rep, mdt_set_disposition(info, rep, (DISP_IT_EXECD | DISP_LOOKUP_EXECD)); + mdt_prep_ma_buf_from_rep(info, o, ma); if (flags & MDS_OPEN_RELEASE) ma->ma_need |= MA_HSM; rc = mdt_attr_get_complex(info, o, ma); @@ -1461,9 +1490,15 @@ int mdt_open_by_fid_lock(struct mdt_thread_info *info, struct ldlm_reply *rep, 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); + object_locked = 1; + if (rc) + GOTO(out_unlock, rc); + } if (ma->ma_valid & MA_PFID) { parent = mdt_object_find(env, mdt, &ma->ma_pfid); @@ -1487,9 +1522,11 @@ int mdt_open_by_fid_lock(struct mdt_thread_info *info, struct ldlm_reply *rep, GOTO(out_unlock, rc); out_unlock: - mdt_object_open_unlock(info, o, lhc, ibits, rc); + if (object_locked) + 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; @@ -1527,18 +1564,12 @@ static int mdt_cross_open(struct mdt_thread_info *info, if (rc) goto out; + mdt_prep_ma_buf_from_rep(info, o, ma); mdt_set_capainfo(info, 0, fid, BYPASS_CAPA); rc = mdt_attr_get_complex(info, o, ma); 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 { /* @@ -1571,6 +1602,7 @@ int mdt_reint_open(struct mdt_thread_info *info, struct mdt_lock_handle *lhc) struct mdt_reint_record *rr = &info->mti_rr; int result, rc; int created = 0; + int object_locked = 0; __u32 msg_flags; ENTRY; @@ -1580,13 +1612,7 @@ int mdt_reint_open(struct mdt_thread_info *info, struct mdt_lock_handle *lhc) mdt_counter_incr(req, LPROC_MDT_OPEN); 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, - RCL_SERVER); ma->ma_need = MA_INODE; - if (ma->ma_lmm_size > 0) - ma->ma_need |= MA_LOV; - ma->ma_valid = 0; LASSERT(info->mti_pill->rc_fmt == &RQF_LDLM_INTENT_OPEN); @@ -1635,23 +1661,16 @@ int mdt_reint_open(struct mdt_thread_info *info, struct mdt_lock_handle *lhc) 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)) @@ -1731,7 +1750,7 @@ int mdt_reint_open(struct mdt_thread_info *info, struct mdt_lock_handle *lhc) mdt_set_capainfo(info, 1, child_fid, BYPASS_CAPA); if (result == -ENOENT) { /* Create under OBF and .lustre is not permitted */ - if (fid_is_obf(rr->rr_fid1) || fid_is_dot_lustre(rr->rr_fid1)) + if (!fid_is_md_operative(rr->rr_fid1)) GOTO(out_child, result = -EPERM); /* save versions in reply */ @@ -1765,7 +1784,7 @@ int mdt_reint_open(struct mdt_thread_info *info, struct mdt_lock_handle *lhc) mdt_clear_disposition(info, ldlm_rep, DISP_OPEN_CREATE); GOTO(out_child, result); } else { - + mdt_prep_ma_buf_from_rep(info, child, ma); /* XXX: we should call this once, see few lines below */ if (result == 0) result = mdt_attr_get_complex(info, child, ma); @@ -1786,22 +1805,10 @@ int mdt_reint_open(struct mdt_thread_info *info, struct mdt_lock_handle *lhc) */ 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); @@ -1809,31 +1816,36 @@ int mdt_reint_open(struct mdt_thread_info *info, struct mdt_lock_handle *lhc) 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 - result = -EREMOTE; + result = -MDT_EREMOTE_OPEN; GOTO(out_child, result); } else if (mdt_object_exists(child)) { /* We have to get attr & LOV EA & HSM for this * object. */ + mdt_prep_ma_buf_from_rep(info, child, ma); ma->ma_need |= MA_HSM; result = mdt_attr_get_complex(info, child, ma); + if (result != 0) + GOTO(out_child, result); } else { /* Object does not exist. Likely FS corruption. */ CERROR("%s: name '"DNAME"' present, but FID " - DFID" is invalid\n", - mdt_obd_name(info->mti_mdt), + DFID" is invalid\n", mdt_obd_name(info->mti_mdt), PNAME(&rr->rr_name), PFID(child_fid)); GOTO(out_child, result = -EIO); } } - 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); @@ -1841,6 +1853,7 @@ int mdt_reint_open(struct mdt_thread_info *info, struct mdt_lock_handle *lhc) /* get openlock if this isn't replay and client requested it */ if (!req_is_replay(req)) { rc = mdt_object_open_lock(info, child, lhc, &ibits); + object_locked = 1; if (rc != 0) GOTO(out_child_unlock, result = rc); else if (create_flags & MDS_OPEN_LOCK) @@ -1867,7 +1880,6 @@ int mdt_reint_open(struct mdt_thread_info *info, struct mdt_lock_handle *lhc) if (created) { ma->ma_need = 0; ma->ma_valid = 0; - ma->ma_cookie_size = 0; rc = mdo_unlink(info->mti_env, mdt_object_child(parent), mdt_object_child(child), @@ -1882,7 +1894,8 @@ int mdt_reint_open(struct mdt_thread_info *info, struct mdt_lock_handle *lhc) } EXIT; out_child_unlock: - mdt_object_open_unlock(info, child, lhc, ibits, result); + if (object_locked) + mdt_object_open_unlock(info, child, lhc, ibits, result); out_child: mdt_object_put(info->mti_env, child); out_parent: @@ -2139,7 +2152,7 @@ out_unlock: 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: @@ -2221,10 +2234,10 @@ int mdt_mfd_close(struct mdt_thread_info *info, struct mdt_file_data *mfd) mdt_mfd_set_mode(mfd, ret == MDT_IOEPOCH_OPENED ? MDS_FMODE_EPOCH : MDS_FMODE_SOM); - LASSERT(mdt_info_req(info)); - med = &mdt_info_req(info)->rq_export->exp_mdt_data; + LASSERT(mdt_info_req(info)); + med = &mdt_info_req(info)->rq_export->exp_mdt_data; spin_lock(&med->med_open_lock); - cfs_list_add(&mfd->mfd_list, &med->med_open_head); + list_add(&mfd->mfd_list, &med->med_open_head); class_handle_hash_back(&mfd->mfd_handle); spin_unlock(&med->med_open_lock); @@ -2271,10 +2284,12 @@ int mdt_close(struct tgt_session_info *tsi) LASSERT(info->mti_ioepoch); + /* These fields are no longer used and are left for compatibility. + * size is always zero */ req_capsule_set_size(info->mti_pill, &RMF_MDT_MD, RCL_SERVER, - info->mti_mdt->mdt_max_mdsize); + 0); req_capsule_set_size(info->mti_pill, &RMF_LOGCOOKIES, RCL_SERVER, - info->mti_mdt->mdt_max_cookiesize); + 0); rc = req_capsule_server_pack(info->mti_pill); if (mdt_check_resent(info, mdt_reconstruct_generic, NULL)) { mdt_client_compatibility(info); @@ -2293,14 +2308,9 @@ int mdt_close(struct tgt_session_info *tsi) 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, - &RMF_LOGCOOKIES); - ma->ma_cookie_size = req_capsule_get_size(info->mti_pill, - &RMF_LOGCOOKIES, - 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); } @@ -2318,7 +2328,7 @@ int mdt_close(struct tgt_session_info *tsi) rc = -ESTALE; } else { class_handle_unhash(&mfd->mfd_handle); - cfs_list_del_init(&mfd->mfd_list); + list_del_init(&mfd->mfd_list); spin_unlock(&med->med_open_lock); /* Do not lose object before last unlink. */ @@ -2370,8 +2380,8 @@ int mdt_done_writing(struct tgt_session_info *tsi) 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); @@ -2402,12 +2412,12 @@ int mdt_done_writing(struct tgt_session_info *tsi) } else rc = -ESTALE; GOTO(error_ucred, rc); - } + } - LASSERT(mfd->mfd_mode == MDS_FMODE_EPOCH || - mfd->mfd_mode == MDS_FMODE_TRUNC); - class_handle_unhash(&mfd->mfd_handle); - cfs_list_del_init(&mfd->mfd_list); + LASSERT(mfd->mfd_mode == MDS_FMODE_EPOCH || + mfd->mfd_mode == MDS_FMODE_TRUNC); + class_handle_unhash(&mfd->mfd_handle); + list_del_init(&mfd->mfd_list); spin_unlock(&med->med_open_lock); /* Set EPOCH CLOSE flag if not set by client. */