struct dt_object_format *dof,
struct thandle *th)
{
- struct osp_thread_info *osi = osp_env_info(env);
- struct update_request *update;
- struct lu_fid *fid1;
- int sizes[2] = {sizeof(struct obdo), 0};
- char *bufs[2] = {NULL, NULL};
- int buf_count;
- int rc;
+ struct osp_thread_info *osi = osp_env_info(env);
+ struct dt_update_request *update;
+ struct lu_fid *fid1;
+ int sizes[2] = {sizeof(struct obdo), 0};
+ char *bufs[2] = {NULL, NULL};
+ int buf_count;
+ int rc;
update = out_find_create_update_loc(th, dt);
if (IS_ERR(update)) {
osi->osi_obdo.o_valid = 0;
obdo_from_la(&osi->osi_obdo, attr, attr->la_valid);
lustre_set_wire_obdo(NULL, &osi->osi_obdo, &osi->osi_obdo);
- obdo_cpu_to_le(&osi->osi_obdo, &osi->osi_obdo);
bufs[0] = (char *)&osi->osi_obdo;
buf_count = 1;
fid1 = (struct lu_fid *)lu_object_fid(&dt->do_lu);
if (hint != NULL && hint->dah_parent) {
struct lu_fid *fid2;
- struct lu_fid *tmp_fid = &osi->osi_fid;
fid2 = (struct lu_fid *)lu_object_fid(&hint->dah_parent->do_lu);
- fid_cpu_to_le(tmp_fid, fid2);
- sizes[1] = sizeof(*tmp_fid);
- bufs[1] = (char *)tmp_fid;
+ sizes[1] = sizeof(*fid2);
+ bufs[1] = (char *)fid2;
buf_count++;
}
CDEBUG(D_HA, "%s: object "DFID" exists, destroy this orphan\n",
dt->do_lu.lo_dev->ld_obd->obd_name, PFID(fid1));
- rc = out_insert_update(env, update, OBJ_REF_DEL, fid1, 0,
+ rc = out_insert_update(env, update, OUT_REF_DEL, fid1, 0,
NULL, NULL);
if (rc != 0)
GOTO(out, rc);
if (S_ISDIR(lu_object_attr(&dt->do_lu))) {
/* decrease for ".." */
- rc = out_insert_update(env, update, OBJ_REF_DEL, fid1,
+ rc = out_insert_update(env, update, OUT_REF_DEL, fid1,
0, NULL, NULL);
if (rc != 0)
GOTO(out, rc);
}
- rc = out_insert_update(env, update, OBJ_DESTROY, fid1, 0, NULL,
+ rc = out_insert_update(env, update, OUT_DESTROY, fid1, 0, NULL,
NULL);
if (rc != 0)
GOTO(out, rc);
update_inc_batchid(update);
}
- rc = out_insert_update(env, update, OBJ_CREATE, fid1, buf_count, sizes,
+ rc = out_insert_update(env, update, OUT_CREATE, fid1, buf_count, sizes,
(const char **)bufs);
out:
if (rc)
* if creation reaches here, it means the object has been created
* successfully */
dt->do_lu.lo_header->loh_attr |= LOHA_EXISTS | (attr->la_mode & S_IFMT);
- if (S_ISDIR(attr->la_mode))
- obj->opo_empty = 1;
+ obj->opo_empty = 1;
return 0;
}
struct dt_object *dt,
struct thandle *th)
{
- struct update_request *update;
- struct lu_fid *fid;
- int rc;
+ struct dt_update_request *update;
+ struct lu_fid *fid;
+ int rc;
update = out_find_create_update_loc(th, dt);
if (IS_ERR(update)) {
fid = (struct lu_fid *)lu_object_fid(&dt->do_lu);
- rc = out_insert_update(env, update, OBJ_REF_DEL, fid, 0, NULL, NULL);
+ rc = out_insert_update(env, update, OUT_REF_DEL, fid, 0, NULL, NULL);
return rc;
}
static int osp_md_declare_ref_add(const struct lu_env *env,
struct dt_object *dt, struct thandle *th)
{
- struct update_request *update;
- struct lu_fid *fid;
- int rc;
+ struct dt_update_request *update;
+ struct lu_fid *fid;
+ int rc;
update = out_find_create_update_loc(th, dt);
if (IS_ERR(update)) {
fid = (struct lu_fid *)lu_object_fid(&dt->do_lu);
- rc = out_insert_update(env, update, OBJ_REF_ADD, fid, 0, NULL, NULL);
+ rc = out_insert_update(env, update, OUT_REF_ADD, fid, 0, NULL, NULL);
return rc;
}
{
LASSERT(ah);
- memset(ah, 0, sizeof(*ah));
ah->dah_parent = parent;
ah->dah_mode = child_mode;
}
-static int osp_md_declare_attr_set(const struct lu_env *env,
- struct dt_object *dt,
- const struct lu_attr *attr,
- struct thandle *th)
+int osp_md_declare_attr_set(const struct lu_env *env, struct dt_object *dt,
+ const struct lu_attr *attr, struct thandle *th)
{
- struct osp_thread_info *osi = osp_env_info(env);
- struct update_request *update;
- struct lu_fid *fid;
- int size = sizeof(struct obdo);
- char *buf;
- int rc;
+ struct osp_thread_info *osi = osp_env_info(env);
+ struct dt_update_request *update;
+ struct lu_fid *fid;
+ int size = sizeof(struct obdo);
+ char *buf;
+ int rc;
update = out_find_create_update_loc(th, dt);
if (IS_ERR(update)) {
obdo_from_la(&osi->osi_obdo, (struct lu_attr *)attr,
attr->la_valid);
lustre_set_wire_obdo(NULL, &osi->osi_obdo, &osi->osi_obdo);
- obdo_cpu_to_le(&osi->osi_obdo, &osi->osi_obdo);
buf = (char *)&osi->osi_obdo;
fid = (struct lu_fid *)lu_object_fid(&dt->do_lu);
- rc = out_insert_update(env, update, OBJ_ATTR_SET, fid, 1, &size,
+ rc = out_insert_update(env, update, OUT_ATTR_SET, fid, 1, &size,
(const char **)&buf);
return rc;
}
-static int osp_md_attr_set(const struct lu_env *env, struct dt_object *dt,
- const struct lu_attr *attr, struct thandle *th,
- struct lustre_capa *capa)
+int osp_md_attr_set(const struct lu_env *env, struct dt_object *dt,
+ const struct lu_attr *attr, struct thandle *th,
+ struct lustre_capa *capa)
{
CDEBUG(D_INFO, "attr set object "DFID"\n",
PFID(&dt->do_lu.lo_header->loh_fid));
struct lu_buf *lbuf = &osp_env_info(env)->osi_lb2;
struct osp_device *osp = lu2osp_dev(dt->do_lu.lo_dev);
struct dt_device *dt_dev = &osp->opd_dt_dev;
- struct update_request *update;
- struct ptlrpc_request *req = NULL;
- int size = strlen((char *)key) + 1;
- int rc;
- struct update_reply *reply;
- struct lu_fid *fid;
-
+ struct dt_update_request *update;
+ struct object_update_reply *reply;
+ struct ptlrpc_request *req = NULL;
+ int size = strlen((char *)key) + 1;
+ struct lu_fid *fid;
+ int rc;
ENTRY;
/* Because it needs send the update buffer right away,
if (IS_ERR(update))
RETURN(PTR_ERR(update));
- rc = out_insert_update(env, update, OBJ_INDEX_LOOKUP,
- lu_object_fid(&dt->do_lu), 1, &size,
- (const char **)&key);
+ rc = out_insert_update(env, update, OUT_INDEX_LOOKUP,
+ lu_object_fid(&dt->do_lu),
+ 1, &size, (const char **)&key);
if (rc) {
CERROR("%s: Insert update error: rc = %d\n",
dt_dev->dd_lu_dev.ld_obd->obd_name, rc);
if (rc < 0)
GOTO(out, rc);
- reply = req_capsule_server_sized_get(&req->rq_pill, &RMF_UPDATE_REPLY,
- UPDATE_BUFFER_SIZE);
- if (reply->ur_version != UPDATE_REPLY_V1) {
+ reply = req_capsule_server_sized_get(&req->rq_pill,
+ &RMF_OUT_UPDATE_REPLY,
+ OUT_UPDATE_REPLY_SIZE);
+ if (reply->ourp_magic != UPDATE_REPLY_MAGIC) {
CERROR("%s: Wrong version %x expected %x: rc = %d\n",
dt_dev->dd_lu_dev.ld_obd->obd_name,
- reply->ur_version, UPDATE_REPLY_V1, -EPROTO);
+ reply->ourp_magic, UPDATE_REPLY_MAGIC, -EPROTO);
GOTO(out, rc = -EPROTO);
}
- rc = update_get_reply_result(reply, NULL, 0);
- if (rc < 0) {
- CERROR("%s: wrong version lookup "DFID" %s: rc = %d\n",
- dt_dev->dd_lu_dev.ld_obd->obd_name,
- PFID(lu_object_fid(&dt->do_lu)), (char *)key, rc);
- GOTO(out, rc);
- }
-
- rc = update_get_reply_buf(reply, lbuf, 0);
+ rc = object_update_result_data_get(reply, lbuf, 0);
if (rc < 0)
- GOTO(out, rc);
+ GOTO(out, rc = size);
if (lbuf->lb_len != sizeof(*fid)) {
CERROR("%s: lookup "DFID" %s wrong size %d\n",
}
fid = lbuf->lb_buf;
- fid_le_to_cpu(fid, fid);
+ if (ptlrpc_rep_need_swab(req))
+ lustre_swab_lu_fid(fid);
if (!fid_is_sane(fid)) {
CERROR("%s: lookup "DFID" %s invalid fid "DFID"\n",
dt_dev->dd_lu_dev.ld_obd->obd_name,
const struct dt_key *key,
struct thandle *th)
{
- struct update_request *update;
- struct lu_fid *fid;
- struct lu_fid *rec_fid = (struct lu_fid *)rec;
- int size[2] = {strlen((char *)key) + 1,
+ struct dt_update_request *update;
+ struct lu_fid *fid;
+ struct lu_fid *rec_fid = (struct lu_fid *)rec;
+ int size[2] = {strlen((char *)key) + 1,
sizeof(*rec_fid)};
- const char *bufs[2] = {(char *)key, (char *)rec_fid};
- int rc;
+ const char *bufs[2] = {(char *)key, (char *)rec_fid};
+ int rc;
update = out_find_create_update_loc(th, dt);
if (IS_ERR(update)) {
fid_cpu_to_le(rec_fid, rec_fid);
- rc = out_insert_update(env, update, OBJ_INDEX_INSERT, fid,
+ rc = out_insert_update(env, update, OUT_INDEX_INSERT, fid,
ARRAY_SIZE(size), size, bufs);
return rc;
}
const struct dt_key *key,
struct thandle *th)
{
- struct update_request *update;
+ struct dt_update_request *update;
struct lu_fid *fid;
int size = strlen((char *)key) + 1;
int rc;
fid = (struct lu_fid *)lu_object_fid(&dt->do_lu);
- rc = out_insert_update(env, update, OBJ_INDEX_DELETE, fid, 1, &size,
+ rc = out_insert_update(env, update, OUT_INDEX_DELETE, fid, 1, &size,
(const char **)&key);
return rc;
*
* Note: for OSP, these index iterate api is only used to check
* whether the directory is empty now (see mdd_dir_is_empty).
- * Since dir_empty will be return by OBJ_ATTR_GET(see osp_attr_get/
+ * Since dir_empty will be return by OUT_ATTR_GET(see osp_attr_get/
* out_attr_get). So the implementation of these iterator is simplied
* to make mdd_dir_is_empty happy. The real iterator should be
* implemented, if we need it one day.
struct dt_object *dt,
struct lustre_handle *lh,
struct ldlm_enqueue_info *einfo,
- void *policy)
+ ldlm_policy_data_t *policy)
{
- struct osp_thread_info *info = osp_env_info(env);
- struct ldlm_res_id *res_id = &info->osi_resid;
- struct dt_device *dt_dev = lu2dt_dev(dt->do_lu.lo_dev);
- struct osp_device *osp = dt2osp_dev(dt_dev);
- struct ptlrpc_request *req = NULL;
- int rc = 0;
- __u64 flags = 0;
- ldlm_mode_t mode;
+ struct ldlm_res_id *res_id;
+ struct dt_device *dt_dev = lu2dt_dev(dt->do_lu.lo_dev);
+ struct osp_device *osp = dt2osp_dev(dt_dev);
+ struct ptlrpc_request *req;
+ int rc = 0;
+ __u64 flags = 0;
+ ldlm_mode_t mode;
- fid_build_reg_res_name(lu_object_fid(&dt->do_lu), res_id);
+ res_id = einfo->ei_res_id;
+ LASSERT(res_id != NULL);
mode = ldlm_lock_match(osp->opd_obd->obd_namespace,
LDLM_FL_BLOCK_GRANTED, res_id,
- einfo->ei_type,
- (ldlm_policy_data_t *)policy,
+ einfo->ei_type, policy,
einfo->ei_mode, lh, 0);
if (mode > 0)
return ELDLM_OK;
return rc == ELDLM_OK ? 0 : -EIO;
}
+static int osp_md_object_unlock(const struct lu_env *env,
+ struct dt_object *dt,
+ struct ldlm_enqueue_info *einfo,
+ ldlm_policy_data_t *policy)
+{
+ struct lustre_handle *lockh = einfo->ei_cbdata;
+
+ /* unlock finally */
+ ldlm_lock_decref(lockh, einfo->ei_mode);
+
+ return 0;
+}
+
struct dt_object_operations osp_md_obj_ops = {
.do_read_lock = osp_md_object_read_lock,
.do_write_lock = osp_md_object_write_lock,
.do_xattr_set = osp_xattr_set,
.do_index_try = osp_md_index_try,
.do_object_lock = osp_md_object_lock,
+ .do_object_unlock = osp_md_object_unlock,
+};
+
+static ssize_t osp_md_declare_write(const struct lu_env *env,
+ struct dt_object *dt,
+ const struct lu_buf *buf,
+ loff_t pos, struct thandle *th)
+{
+ struct dt_update_request *update;
+ struct lu_fid *fid;
+ int sizes[2] = {buf->lb_len, sizeof(pos)};
+ const char *bufs[2] = {(char *)buf->lb_buf,
+ (char *)&pos};
+ ssize_t rc;
+
+ update = out_find_create_update_loc(th, dt);
+ if (IS_ERR(update)) {
+ CERROR("%s: Get OSP update buf failed: rc = %d\n",
+ dt->do_lu.lo_dev->ld_obd->obd_name,
+ (int)PTR_ERR(update));
+ return PTR_ERR(update);
+ }
+
+ pos = cpu_to_le64(pos);
+ bufs[1] = (char *)&pos;
+ fid = (struct lu_fid *)lu_object_fid(&dt->do_lu);
+ rc = out_insert_update(env, update, OUT_WRITE, fid,
+ ARRAY_SIZE(sizes), sizes, bufs);
+
+ return rc;
+
+}
+
+static ssize_t osp_md_write(const struct lu_env *env, struct dt_object *dt,
+ const struct lu_buf *buf, loff_t *pos,
+ struct thandle *handle,
+ struct lustre_capa *capa, int ignore_quota)
+{
+ return buf->lb_len;
+}
+
+/* These body operation will be used to write symlinks during migration etc */
+struct dt_body_operations osp_md_body_ops = {
+ .dbo_declare_write = osp_md_declare_write,
+ .dbo_write = osp_md_write,
};
git://git.whamcloud.com / fs / lustre-release.git / blobdiff