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);
}
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);
}
/* 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,
ma->ma_valid = 0;
mutex_lock(&o->mot_lov_mutex);
if (!(o->mot_flags & MOF_LOV_CREATED)) {
- if (p != NULL && !fid_is_md_operative(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);
if (rc == 0 && ma->ma_valid & MA_LOV)
o->mot_flags |= MOF_LOV_CREATED;
}
-unlock:
+
mutex_unlock(&o->mot_lov_mutex);
RETURN(rc);
}
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);
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;
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);
}
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);
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;
}
/*
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;
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_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 */
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)) {
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)) {
struct mdt_object *parent= NULL;
struct mdt_object *o;
int rc;
+ int object_locked = 0;
__u64 ibits = 0;
ENTRY;
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);
+ object_locked = 1;
+ if (rc)
+ GOTO(out_unlock, rc);
+ }
if (ma->ma_valid & MA_PFID) {
parent = mdt_object_find(env, mdt, &ma->ma_pfid);
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;
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 {
/*
struct mdt_reint_record *rr = &info->mti_rr;
int result, rc;
int created = 0;
+ int object_locked = 0;
__u32 msg_flags;
ENTRY;
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
- 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
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 "
}
}
- 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);
/* 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)
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),
}
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:
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:
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);
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);
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);
}
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. */
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);
} 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. */
git://git.whamcloud.com / fs / lustre-release.git / blobdiff