/*
* Find the mfd pointed to by handle in global hash table.
* In case of replay the handle is obsoleted
- * but mfd can be found in mfd list by that handle
+ * but mfd can be found in mfd list by that handle.
+ * Callers need to be holding med_open_lock.
*/
struct mdt_file_data *mdt_handle2mfd(struct mdt_export_data *med,
const struct lustre_handle *handle,
RETURN(mdt_ioepoch_close_on_eviction(info, o));
if (lustre_msg_get_flags(req->rq_reqmsg) & MSG_REPLAY)
RETURN(mdt_ioepoch_close_on_replay(info, o));
- if (info->mti_ioepoch->flags & MF_EPOCH_CLOSE)
+ if (info->mti_ioepoch && (info->mti_ioepoch->flags & MF_EPOCH_CLOSE))
RETURN(mdt_ioepoch_close_reg(info, o));
/* IO epoch is not closed. */
RETURN(MDT_IOEPOCH_OPENED);
ioepoch = info->mti_ioepoch ?
info->mti_ioepoch->ioepoch : o->mot_ioepoch;
- if (!(lustre_msg_get_flags(req->rq_reqmsg) & MSG_REPLAY))
+ if (req != NULL
+ && !(lustre_msg_get_flags(req->rq_reqmsg) & MSG_REPLAY))
rc = mdt_som_attr_set(info, o, ioepoch, act);
mdt_object_som_enable(o, ioepoch);
}
}
static int mdt_mfd_open(struct mdt_thread_info *info, struct mdt_object *p,
- struct mdt_object *o, __u64 flags, int created)
+ struct mdt_object *o, __u64 flags, int created,
+ struct ldlm_reply *rep)
{
struct ptlrpc_request *req = mdt_info_req(info);
struct mdt_export_data *med = &req->rq_export->exp_mdt_data;
rc = mdt_create_data(info, p, o);
if (rc)
RETURN(rc);
+
+ if (exp_connect_flags(req->rq_export) & OBD_CONNECT_DISP_STRIPE)
+ mdt_set_disposition(info, rep, DISP_OPEN_STRIPE);
}
CDEBUG(D_INODE, "after open, ma_valid bit = "LPX64" lmm_size = %d\n",
repbody->ioepoch = o->mot_ioepoch;
}
} else if (flags & MDS_FMODE_EXEC) {
- /* if file is released, we can't deny write because we must
- * restore (write) it to access it.*/
- if ((ma->ma_valid & MA_HSM) &&
- (ma->ma_hsm.mh_flags & HS_RELEASED))
- rc = 0;
- else
- rc = mdt_write_deny(o);
+ rc = mdt_write_deny(o);
}
if (rc)
RETURN(rc);
* restart replay, so there maybe some orphan
* mfd here, we should remove them */
LASSERT(info->mti_rr.rr_handle != NULL);
+ spin_lock(&med->med_open_lock);
old_mfd = mdt_handle2mfd(med, info->mti_rr.rr_handle, true);
if (old_mfd != NULL) {
CDEBUG(D_HA, "delete orphan mfd = %p, fid = "DFID", "
"cookie = "LPX64"\n", mfd,
PFID(mdt_object_fid(mfd->mfd_object)),
info->mti_rr.rr_handle->cookie);
- spin_lock(&med->med_open_lock);
class_handle_unhash(&old_mfd->mfd_handle);
cfs_list_del_init(&old_mfd->mfd_list);
spin_unlock(&med->med_open_lock);
mdt_mfd_close(info, old_mfd);
ma->ma_attr_flags &= ~MDS_RECOV_OPEN;
ma->ma_valid &= ~MA_FLAGS;
+ } else {
+ spin_unlock(&med->med_open_lock);
+ CDEBUG(D_HA, "orphan mfd not found, fid = "DFID", "
+ "cookie = "LPX64"\n",
+ PFID(mdt_object_fid(mfd->mfd_object)),
+ info->mti_rr.rr_handle->cookie);
}
CDEBUG(D_HA, "Store old cookie "LPX64" in new mfd\n",
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,
}
#endif
- if (info->mti_mdt->mdt_opts.mo_mds_capa &&
+ if (info->mti_mdt->mdt_lut.lut_mds_capa &&
exp_connect_flags(exp) & OBD_CONNECT_MDS_CAPA) {
struct lustre_capa *capa;
RETURN(rc);
repbody->valid |= OBD_MD_FLMDSCAPA;
}
-
- if (info->mti_mdt->mdt_opts.mo_oss_capa &&
+ if (info->mti_mdt->mdt_lut.lut_oss_capa &&
exp_connect_flags(exp) & OBD_CONNECT_OSS_CAPA &&
S_ISREG(lu_object_attr(&o->mot_obj))) {
struct lustre_capa *capa;
repbody->valid |= OBD_MD_FLEASIZE;
}
mdt_set_disposition(info, rep, DISP_OPEN_OPEN);
- RETURN(0);
- }
- }
+ RETURN(0);
+ }
+ }
- rc = mdt_mfd_open(info, p, o, flags, created);
+ rc = mdt_mfd_open(info, p, o, flags, created, rep);
if (!rc)
mdt_set_disposition(info, rep, DISP_OPEN_OPEN);
- RETURN(rc);
+ RETURN(rc);
}
extern void mdt_req_from_lcd(struct ptlrpc_request *req,
struct lsd_client_data *lcd = ted->ted_lcd;
struct md_attr *ma = &info->mti_attr;
struct mdt_reint_record *rr = &info->mti_rr;
- __u32 flags = info->mti_spec.sp_cr_flags;
+ __u64 flags = info->mti_spec.sp_cr_flags;
struct ldlm_reply *ldlm_rep;
struct mdt_object *parent;
struct mdt_object *child;
LASSERT(ergo(rc < 0, lustre_msg_get_transno(req->rq_repmsg) == 0));
}
-int mdt_open_by_fid(struct mdt_thread_info* info,
- struct ldlm_reply *rep)
+int mdt_open_by_fid(struct mdt_thread_info *info, struct ldlm_reply *rep)
{
- __u32 flags = info->mti_spec.sp_cr_flags;
+ __u64 flags = info->mti_spec.sp_cr_flags;
struct mdt_reint_record *rr = &info->mti_rr;
struct md_attr *ma = &info->mti_attr;
struct mdt_object *o;
if (open_flags & MDS_OPEN_LOCK) {
if (open_flags & FMODE_WRITE)
lm = LCK_CW;
- /* if file is released, we can't deny write because we must
- * restore (write) it to access it. */
- else if ((open_flags & MDS_FMODE_EXEC) &&
- !((ma->ma_valid & MA_HSM) &&
- (ma->ma_hsm.mh_flags & HS_RELEASED)))
+ else if (open_flags & MDS_FMODE_EXEC)
lm = LCK_PR;
else
lm = LCK_CR;
", open_flags = "LPO64"\n",
PFID(mdt_object_fid(obj)), open_flags);
+ /* We cannot enqueue another lock for the same resource we
+ * already have a lock for, due to mechanics of waiting list
+ * iterating in ldlm, see LU-3601.
+ * As such we'll drop the open lock we just got above here,
+ * it's ok not to have this open lock as it's main purpose is to
+ * flush unused cached client open handles. */
+ if (lustre_handle_is_used(&lhc->mlh_reg_lh))
+ mdt_object_unlock(info, obj, lhc, 1);
+
LASSERT(!try_layout);
mdt_lock_handle_init(ll);
mdt_lock_reg_init(ll, LCK_EX);
rc = 1;
}
- if (rc != 0) {
+ if (rc != 0 || !lustre_handle_is_used(&lhc->mlh_reg_lh)) {
struct ldlm_reply *ldlm_rep;
ldlm_rep = req_capsule_server_get(info->mti_pill, &RMF_DLM_REP);
mdt_clear_disposition(info, ldlm_rep, DISP_OPEN_LOCK);
- mdt_object_unlock(info, obj, lhc, 1);
+ if (lustre_handle_is_used(&lhc->mlh_reg_lh))
+ mdt_object_unlock(info, obj, lhc, 1);
}
RETURN_EXIT;
}
/**
* Check release is permitted for the current HSM flags.
*/
-static bool mdt_hsm_release_allow(struct md_attr *ma)
+static bool mdt_hsm_release_allow(const struct md_attr *ma)
{
if (!(ma->ma_valid & MA_HSM))
return false;
return rc;
}
-int mdt_pin(struct mdt_thread_info* info)
-{
- ENTRY;
- RETURN(err_serious(-EOPNOTSUPP));
-}
-
/* Cross-ref request. Currently it can only be a pure open (w/o create) */
static int mdt_cross_open(struct mdt_thread_info *info,
const struct lu_fid *parent_fid,
struct lu_fid *child_fid = &info->mti_tmp_fid1;
struct md_attr *ma = &info->mti_attr;
__u64 create_flags = info->mti_spec.sp_cr_flags;
- __u64 ibits;
+ __u64 ibits = 0;
struct mdt_reint_record *rr = &info->mti_rr;
- struct lu_name *lname;
int result, rc;
int created = 0;
__u32 msg_flags;
info->mti_spec.u.sp_ea.eadata == NULL)
GOTO(out, result = err_serious(-EINVAL));
- CDEBUG(D_INODE, "I am going to open "DFID"/(%s->"DFID") "
- "cr_flag="LPO64" 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, msg_flags);
+ CDEBUG(D_INODE, "I am going to open "DFID"/("DNAME"->"DFID") "
+ "cr_flag="LPO64" mode=0%06o msg_flag=0x%x\n",
+ PFID(rr->rr_fid1), PNAME(&rr->rr_name),
+ PFID(rr->rr_fid2), create_flags,
+ ma->ma_attr.la_mode, msg_flags);
+
if (info->mti_cross_ref) {
/* This is cross-ref open */
mdt_set_disposition(info, ldlm_rep,
GOTO(out, result = -EFAULT);
}
CDEBUG(D_INFO, "No object(1), continue as regular open.\n");
- } else if ((rr->rr_namelen == 0 && create_flags & MDS_OPEN_LOCK) ||
+ } else if ((!lu_name_is_valid(&rr->rr_name) &&
+ (create_flags & MDS_OPEN_LOCK)) ||
(create_flags & MDS_OPEN_BY_FID)) {
result = mdt_open_by_fid_lock(info, ldlm_rep, lhc);
/* If result is 0 then open by FID has found the file
result != -EREMOTE)
GOTO(out, result);
- if (unlikely(rr->rr_namelen == 0))
- GOTO(out, result = -EINVAL);
-
CDEBUG(D_INFO, "No object(2), continue as regular open.\n");
}
mdt_set_disposition(info, ldlm_rep,
(DISP_IT_EXECD | DISP_LOOKUP_EXECD));
+ if (!lu_name_is_valid(&rr->rr_name))
+ GOTO(out, result = -EPROTO);
+
lh = &info->mti_lh[MDT_LH_PARENT];
- mdt_lock_pdo_init(lh, (create_flags & MDS_OPEN_CREAT) ?
- LCK_PW : LCK_PR, rr->rr_name, rr->rr_namelen);
+ mdt_lock_pdo_init(lh,
+ (create_flags & MDS_OPEN_CREAT) ? LCK_PW : LCK_PR,
+ &rr->rr_name);
parent = mdt_object_find_lock(info, rr->rr_fid1, lh,
MDS_INODELOCK_UPDATE);
fid_zero(child_fid);
- lname = mdt_name(info->mti_env, (char *)rr->rr_name, rr->rr_namelen);
- result = mdo_lookup(info->mti_env, mdt_object_child(parent),
- lname, child_fid, &info->mti_spec);
- LASSERTF(ergo(result == 0, fid_is_sane(child_fid)),
- "looking for "DFID"/%s, result fid="DFID"\n",
- PFID(mdt_object_fid(parent)), rr->rr_name, PFID(child_fid));
+ result = mdo_lookup(info->mti_env, mdt_object_child(parent),
+ &rr->rr_name, child_fid, &info->mti_spec);
+
+ LASSERTF(ergo(result == 0, fid_is_sane(child_fid)),
+ "looking for "DFID"/"DNAME", found FID = "DFID"\n",
+ PFID(mdt_object_fid(parent)), PNAME(&rr->rr_name),
+ PFID(child_fid));
if (result != 0 && result != -ENOENT && result != -ESTALE)
GOTO(out_parent, result);
}
if (!(create_flags & MDS_OPEN_CREAT))
GOTO(out_parent, result);
+ if (exp_connect_flags(req->rq_export) & OBD_CONNECT_RDONLY)
+ GOTO(out_parent, result = -EROFS);
*child_fid = *info->mti_rr.rr_fid2;
LASSERTF(fid_is_sane(child_fid), "fid="DFID"\n",
PFID(child_fid));
if (fid_is_obf(rr->rr_fid1) || fid_is_dot_lustre(rr->rr_fid1))
GOTO(out_child, result = -EPERM);
- /* save versions in reply */
- mdt_version_get_save(info, parent, 0);
- mdt_version_get_save(info, child, 1);
+ /* save versions in reply */
+ mdt_version_get_save(info, parent, 0);
+ mdt_version_get_save(info, child, 1);
- /* version of child will be changed */
- info->mti_mos = child;
+ /* version of child will be changed */
+ tgt_vbr_obj_set(info->mti_env, mdt_obj2dt(child));
/* Not found and with MDS_OPEN_CREAT: let's create it. */
mdt_set_disposition(info, ldlm_rep, DISP_OPEN_CREATE);
info->mti_spec.sp_cr_lookup = 0;
info->mti_spec.sp_feat = &dt_directory_features;
- result = mdo_create(info->mti_env,
- mdt_object_child(parent),
- lname,
- mdt_object_child(child),
- &info->mti_spec,
- &info->mti_attr);
+ result = mdo_create(info->mti_env,
+ mdt_object_child(parent),
+ &rr->rr_name,
+ mdt_object_child(child),
+ &info->mti_spec,
+ &info->mti_attr);
if (result == -ERESTART) {
mdt_clear_disposition(info, ldlm_rep, DISP_OPEN_CREATE);
GOTO(out_child, result);
else
result = -EREMOTE;
GOTO(out_child, result);
+ } else if (mdt_object_exists(child)) {
+ /* We have to get attr & LOV EA & HSM for this
+ * object. */
+ ma->ma_need |= MA_HSM;
+ result = mdt_attr_get_complex(info, child, ma);
} else {
- if (mdt_object_exists(child)) {
- /* We have to get attr & LOV EA & HSM for this
- * object */
- ma->ma_need |= MA_HSM;
- result = mdt_attr_get_complex(info, child, ma);
- } else {
- /*object non-exist!!!*/
- LBUG();
- }
+ /* Object does not exist. Likely FS corruption. */
+ CERROR("%s: name '"DNAME"' present, but FID "
+ DFID" is invalid\n",
+ mdt_obd_name(info->mti_mdt),
+ PNAME(&rr->rr_name), PFID(child_fid));
+ GOTO(out_child, result = -EIO);
}
}
- LASSERT(!lustre_handle_is_used(&lhc->mlh_reg_lh));
-
- /* get openlock if this is not replay and if a client requested it */
- if (!req_is_replay(req)) {
- rc = mdt_object_open_lock(info, child, lhc, &ibits);
- if (rc != 0)
- GOTO(out_child_unlock, result = rc);
- else if (create_flags & MDS_OPEN_LOCK)
+ if (lustre_handle_is_used(&lhc->mlh_reg_lh)) {
+ /* the open lock might already be gotten in
+ * mdt_intent_fixup_resent */
+ 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);
+ } else {
+ /* 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);
+ if (rc != 0)
+ GOTO(out_child_unlock, result = rc);
+ else if (create_flags & MDS_OPEN_LOCK)
+ mdt_set_disposition(info, ldlm_rep,
+ DISP_OPEN_LOCK);
+ }
}
-
/* Try to open it now. */
rc = mdt_finish_open(info, parent, child, create_flags,
created, ldlm_rep);
rc = mdo_unlink(info->mti_env,
mdt_object_child(parent),
mdt_object_child(child),
- lname,
+ &rr->rr_name,
&info->mti_attr, 0);
if (rc != 0)
CERROR("%s: "DFID" cleanup of open: rc = %d\n",
{
const struct lu_env *env = info->mti_env;
struct md_op_spec *spec = &info->mti_spec;
- struct lu_fid *rootfid = &info->mti_tmp_fid1;
+ struct lu_fid *local_root_fid = &info->mti_tmp_fid1;
struct mdt_object *obj = NULL;
struct mdt_object *local_root;
- static const char name[] = "i_am_nobody";
- struct lu_name *lname;
+ static const struct lu_name lname = {
+ .ln_name = "i_am_nobody",
+ .ln_namelen = sizeof("i_am_nobody") - 1,
+ };
+ struct lu_ucred *uc;
+ cfs_cap_t uc_cap_save;
int rc;
ENTRY;
- rc = dt_root_get(env, mdt->mdt_bottom, rootfid);
+ rc = dt_root_get(env, mdt->mdt_bottom, local_root_fid);
if (rc != 0)
RETURN(ERR_PTR(rc));
- local_root = mdt_object_find(env, mdt, rootfid);
+ local_root = mdt_object_find(env, mdt, local_root_fid);
if (IS_ERR(local_root))
RETURN(local_root);
spec->sp_cr_flags |= MDS_OPEN_DELAY_CREATE;
}
- lname = mdt_name(env, (char *)name, sizeof(name) - 1);
- rc = mdo_create(env, mdt_object_child(local_root), lname,
+ uc = lu_ucred(env);
+ uc_cap_save = uc->uc_cap;
+ uc->uc_cap |= 1 << CFS_CAP_DAC_OVERRIDE;
+ rc = mdo_create(env, mdt_object_child(local_root), &lname,
mdt_object_child(obj), spec, attr);
- if (rc == 0) {
- rc = mo_open(env, mdt_object_child(obj), MDS_OPEN_CREATED);
- if (rc < 0)
- CERROR("%s: cannot open volatile file "DFID", orphan "
- "file will be left in PENDING directory until "
- "next reboot, rc = %d\n", mdt_obd_name(mdt),
- PFID(fid), rc);
+ uc->uc_cap = uc_cap_save;
+ if (rc < 0) {
+ CERROR("%s: cannot create volatile file "DFID": rc = %d\n",
+ mdt_obd_name(mdt), PFID(fid), rc);
+ GOTO(out, rc);
}
- EXIT;
+
+ rc = mo_open(env, mdt_object_child(obj), MDS_OPEN_CREATED);
+ if (rc < 0)
+ CERROR("%s: cannot open volatile file "DFID", orphan "
+ "file will be left in PENDING directory until "
+ "next reboot, rc = %d\n", mdt_obd_name(mdt),
+ PFID(fid), rc);
+ GOTO(out, rc);
out:
if (rc < 0) {
int rc2;
ENTRY;
+ if (exp_connect_flags(info->mti_exp) & OBD_CONNECT_RDONLY)
+ RETURN(-EROFS);
+
data = req_capsule_client_get(info->mti_pill, &RMF_CLOSE_DATA);
if (data == NULL)
RETURN(-EPROTO);
/* try to hold open_sem so that nobody else can open the file */
if (!down_write_trylock(&o->mot_open_sem)) {
ldlm_lock_cancel(lease);
- ldlm_lock_put(lease);
- RETURN(-EBUSY);
+ GOTO(out_reprocess, rc = -EBUSY);
}
/* Check if the lease open lease has already canceled */
* have been cancelled. It's okay to cancel it now as we've
* held mot_open_sem. */
ldlm_lock_cancel(lease);
- ldlm_lock_put(lease);
if (lease_broken) /* don't perform release task */
GOTO(out_unlock, rc = -ESTALE);
/* ma_need was set before but it seems fine to change it in order to
* avoid modifying the one from RPC */
- ma->ma_need = MA_HSM | MA_LOV;
+ ma->ma_need = MA_HSM;
rc = mdt_attr_get_complex(info, o, ma);
if (rc != 0)
GOTO(out_unlock, rc);
CDEBUG(D_HSM, DFID" data_version mismatches: packed="LPU64
" and on-disk="LPU64"\n", PFID(mdt_object_fid(o)),
data->cd_data_version, ma->ma_hsm.mh_arch_ver);
- /* XXX: Enable this line when hsm_archive is operational!
GOTO(out_unlock, rc = -EPERM);
- */
}
ma->ma_valid = MA_INODE;
- ma->ma_attr.la_valid &= LA_SIZE | LA_MTIME | LA_ATIME;
+ ma->ma_attr.la_valid &= LA_ATIME | LA_MTIME | LA_CTIME | LA_SIZE;
rc = mo_attr_set(info->mti_env, mdt_object_child(o), ma);
if (rc < 0)
GOTO(out_unlock, rc);
+ ma->ma_need = MA_INODE | MA_LOV;
+ rc = mdt_attr_get_complex(info, o, ma);
+ if (rc < 0)
+ GOTO(out_unlock, rc);
+
if (!(ma->ma_valid & MA_LOV)) {
/* Even empty file are released */
memset(ma->ma_lmm, 0, sizeof(*ma->ma_lmm));
ma->ma_lmm->lmm_magic = cpu_to_le32(LOV_MAGIC_V1_DEF);
ma->ma_lmm->lmm_pattern = cpu_to_le32(LOV_PATTERN_RAID0);
ma->ma_lmm->lmm_stripe_size = cpu_to_le32(LOV_MIN_STRIPE_SIZE);
- ma->ma_valid |= MA_LOV;
+ ma->ma_lmm_size = sizeof(*ma->ma_lmm);
} else {
/* Magic must be LOV_MAGIC_Vx_DEF otherwise LOD will interpret
* ma_lmm as lov_user_md, then it will be confused by union of
/* Hopefully it's not used in this call path */
orp_ma = &info->mti_u.som.attr;
- orp_ma->ma_valid = MA_INODE | MA_LOV;
- orp_ma->ma_attr.la_mode = S_IFREG;
- orp_ma->ma_attr.la_valid = LA_MODE;
+ orp_ma->ma_attr.la_mode = S_IFREG | S_IWUSR;
+ orp_ma->ma_attr.la_uid = ma->ma_attr.la_uid;
+ orp_ma->ma_attr.la_gid = ma->ma_attr.la_gid;
+ orp_ma->ma_attr.la_valid = LA_MODE | LA_UID | LA_GID;
orp_ma->ma_lmm = ma->ma_lmm;
orp_ma->ma_lmm_size = ma->ma_lmm_size;
+ orp_ma->ma_valid = MA_INODE | MA_LOV;
orphan = mdt_orphan_open(info, info->mti_mdt, &data->cd_fid, orp_ma,
FMODE_WRITE);
if (IS_ERR(orphan)) {
ma->ma_hsm.mh_flags |= HS_RELEASED;
lustre_hsm2buf(buf->lb_buf, &ma->ma_hsm);
ma->ma_hsm.mh_flags &= ~HS_RELEASED;
+
+ mdt_lock_reg_init(lh, LCK_EX);
+ rc = mdt_object_lock(info, o, lh, MDS_INODELOCK_LAYOUT |
+ MDS_INODELOCK_XATTR, MDT_LOCAL_LOCK);
+ if (rc != 0)
+ GOTO(out_close, rc);
+
rc = mo_xattr_set(info->mti_env, mdt_object_child(orphan), buf,
XATTR_NAME_HSM, 0);
- if (rc < 0)
- GOTO(out_close, rc);
- mdt_lock_reg_init(lh, LCK_EX);
- rc = mdt_object_lock(info, o, lh, MDS_INODELOCK_LAYOUT, MDT_LOCAL_LOCK);
- if (rc == 0) {
+ if (rc == 0)
/* Swap layout with orphan object */
rc = mo_swap_layouts(info->mti_env, mdt_object_child(o),
mdt_object_child(orphan),
SWAP_LAYOUTS_MDS_HSM);
- /* Release exclusive LL */
- mdt_object_unlock(info, o, lh, 1);
- }
+ /* Release exclusive LL */
+ mdt_object_unlock(info, o, lh, 1);
+
EXIT;
out_close:
repbody->valid |= OBD_MD_FLRELEASED;
}
+out_reprocess:
+ ldlm_reprocess_all(lease->l_resource);
+ LDLM_LOCK_PUT(lease);
+
ma->ma_valid = 0;
ma->ma_need = 0;
+
return rc;
}
RETURN(rc ? rc : ret);
}
-int mdt_close(struct mdt_thread_info *info)
+int mdt_close(struct tgt_session_info *tsi)
{
+ struct mdt_thread_info *info = tsi2mdt_info(tsi);
+ struct ptlrpc_request *req = tgt_ses_req(tsi);
struct mdt_export_data *med;
struct mdt_file_data *mfd;
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;
mdt_counter_incr(req, LPROC_MDT_CLOSE);
- /* Close may come with the Size-on-MDS update. Unpack it. */
- rc = mdt_close_unpack(info);
- if (rc)
- RETURN(err_serious(rc));
+ /* Close may come with the Size-on-MDS update. Unpack it. */
+ rc = mdt_close_unpack(info);
+ if (rc)
+ GOTO(out, rc = err_serious(rc));
LASSERT(info->mti_ioepoch);
if (rc == 0)
mdt_fix_reply(info);
mdt_exit_ucred(info);
- RETURN(lustre_msg_get_status(req->rq_repmsg));
+ GOTO(out, rc = lustre_msg_get_status(req->rq_repmsg));
}
/* Continue to close handle even if we can not pack reply */
}
mdt_exit_ucred(info);
- if (OBD_FAIL_CHECK(OBD_FAIL_MDS_CLOSE_PACK))
- RETURN(err_serious(-ENOMEM));
+ if (OBD_FAIL_CHECK(OBD_FAIL_MDS_CLOSE_PACK))
+ GOTO(out, rc = 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);
+ if (OBD_FAIL_CHECK_RESET(OBD_FAIL_MDS_CLOSE_NET_REP,
+ OBD_FAIL_MDS_CLOSE_NET_REP))
+ tsi->tsi_reply_fail_id = OBD_FAIL_MDS_CLOSE_NET_REP;
+out:
+ mdt_thread_info_fini(info);
+ RETURN(rc ? rc : ret);
}
/**
* and got a trasid. Waiting for such DONE_WRITING is not reliable, so just
* skip attributes and reconstruct the reply here.
*/
-int mdt_done_writing(struct mdt_thread_info *info)
+int mdt_done_writing(struct tgt_session_info *tsi)
{
- struct ptlrpc_request *req = mdt_info_req(info);
+ struct ptlrpc_request *req = tgt_ses_req(tsi);
+ struct mdt_thread_info *info = tsi2mdt_info(tsi);
struct mdt_body *repbody = NULL;
struct mdt_export_data *med;
struct mdt_file_data *mfd;
int rc;
ENTRY;
- rc = req_capsule_server_pack(info->mti_pill);
- if (rc)
- RETURN(err_serious(rc));
+ rc = req_capsule_server_pack(tsi->tsi_pill);
+ if (rc)
+ GOTO(out, rc = err_serious(rc));
- repbody = req_capsule_server_get(info->mti_pill,
- &RMF_MDT_BODY);
- repbody->eadatasize = 0;
- repbody->aclsize = 0;
+ repbody = req_capsule_server_get(tsi->tsi_pill, &RMF_MDT_BODY);
+ repbody->eadatasize = 0;
+ repbody->aclsize = 0;
- /* Done Writing may come with the Size-on-MDS update. Unpack it. */
- rc = mdt_close_unpack(info);
- if (rc)
- RETURN(err_serious(rc));
+ /* Done Writing may come with the Size-on-MDS update. Unpack it. */
+ rc = mdt_close_unpack(info);
+ if (rc)
+ GOTO(out, rc = err_serious(rc));
if (mdt_check_resent(info, mdt_reconstruct_generic, NULL)) {
mdt_exit_ucred(info);
- RETURN(lustre_msg_get_status(req->rq_repmsg));
+ GOTO(out, rc = lustre_msg_get_status(req->rq_repmsg));
}
- med = &info->mti_exp->exp_mdt_data;
+ med = &info->mti_exp->exp_mdt_data;
spin_lock(&med->med_open_lock);
mfd = mdt_handle2mfd(med, &info->mti_ioepoch->handle,
req_is_replay(req));
mdt_empty_transno(info, rc);
error_ucred:
mdt_exit_ucred(info);
+out:
+ mdt_thread_info_fini(info);
RETURN(rc);
}
git://git.whamcloud.com / fs / lustre-release.git / blobdiff