*
* \param[in] env pointer to the thread context
* \param[in] dt pointer to the OSP layer dt_object
- * \param[in] capa the capability for this operation
*
* \retval 0 for success
* \retval negative error number on failure
*/
-static int osp_declare_attr_get(const struct lu_env *env, struct dt_object *dt,
- struct lustre_capa *capa)
+static int osp_declare_attr_get(const struct lu_env *env, struct dt_object *dt)
{
struct osp_object *obj = dt2osp_obj(dt);
struct osp_device *osp = lu2osp_dev(dt->do_lu.lo_dev);
* \param[in] env pointer to the thread context
* \param[in] dt pointer to the OSP layer dt_object
* \param[out] attr pointer to the buffer to hold the output attribute
- * \param[in] capa the capability for this operation
*
* \retval 0 for success
* \retval negative error number on failure
*/
int osp_attr_get(const struct lu_env *env, struct dt_object *dt,
- struct lu_attr *attr, struct lustre_capa *capa)
+ struct lu_attr *attr)
{
struct osp_device *osp = lu2osp_dev(dt->do_lu.lo_dev);
struct osp_object *obj = dt2osp_obj(dt);
GOTO(out, rc);
}
- rc = out_remote_sync(env, osp->opd_obd->u.cli.cl_import, update, &req);
+ rc = osp_remote_sync(env, osp, update, &req);
if (rc != 0) {
if (rc == -ENOENT) {
osp2lu_obj(obj)->lo_header->loh_attr &= ~LOHA_EXISTS;
return rc;
}
-static int __osp_attr_set(const struct lu_env *env, struct dt_object *dt,
- const struct lu_attr *attr, struct thandle *th)
+/**
+ * Implement OSP layer dt_object_operations::do_declare_attr_set() interface.
+ *
+ * If the transaction is not remote one, then declare the credits that will
+ * be used for the subsequent llog record for the object's attributes.
+ *
+ * \param[in] env pointer to the thread context
+ * \param[in] dt pointer to the OSP layer dt_object
+ * \param[in] attr pointer to the attribute to be set
+ * \param[in] th pointer to the transaction handler
+ *
+ * \retval 0 for success
+ * \retval negative error number on failure
+ */
+static int osp_declare_attr_set(const struct lu_env *env, struct dt_object *dt,
+ const struct lu_attr *attr, struct thandle *th)
{
struct osp_device *d = lu2osp_dev(dt->do_lu.lo_dev);
struct osp_object *o = dt2osp_obj(dt);
- struct lu_attr *la;
- int rc = 0;
- ENTRY;
+ int rc;
+ if (is_only_remote_trans(th))
+ return osp_md_declare_attr_set(env, dt, attr, th);
/*
* Usually we don't allow server stack to manipulate size
* but there is a special case when striping is created
LASSERT(!dt_object_exists(dt));
osp_object_assign_fid(env, d, o);
rc = osp_object_truncate(env, dt, attr->la_size);
- if (rc)
+ if (rc != 0)
RETURN(rc);
}
if (!(attr->la_valid & (LA_UID | LA_GID)))
RETURN(0);
- if (!is_only_remote_trans(th)) {
- /*
- * track all UID/GID changes via llog
- */
- rc = osp_sync_declare_add(env, o, MDS_SETATTR64_REC, th);
- } else {
- /* It is for OST-object attr_set directly without updating
- * local MDT-object attribute. It is usually used by LFSCK. */
- rc = __osp_md_attr_set(env, dt, attr, th);
- }
-
- if (rc != 0 || o->opo_ooa == NULL)
- RETURN(rc);
-
- /* Update the OSP object attributes cache. */
- la = &o->opo_ooa->ooa_attr;
- spin_lock(&o->opo_lock);
- if (attr->la_valid & LA_UID) {
- la->la_uid = attr->la_uid;
- la->la_valid |= LA_UID;
- }
-
- if (attr->la_valid & LA_GID) {
- la->la_gid = attr->la_gid;
- la->la_valid |= LA_GID;
- }
- spin_unlock(&o->opo_lock);
-
- RETURN(0);
-}
-
-/**
- * Implement OSP layer dt_object_operations::do_declare_attr_set() interface.
- *
- * If the transaction is not remote one, then declare the credits that will
- * be used for the subsequent llog record for the object's attributes.
- *
- * \param[in] env pointer to the thread context
- * \param[in] dt pointer to the OSP layer dt_object
- * \param[in] attr pointer to the attribute to be set
- * \param[in] th pointer to the transaction handler
- *
- * \retval 0 for success
- * \retval negative error number on failure
- */
-static int osp_declare_attr_set(const struct lu_env *env, struct dt_object *dt,
- const struct lu_attr *attr, struct thandle *th)
-{
- int rc = 0;
-
- if (!is_only_remote_trans(th)) {
- rc = __osp_attr_set(env, dt, attr, th);
-
- CDEBUG(D_INFO, "declare set attr "DFID": rc = %d\n",
- PFID(&dt->do_lu.lo_header->loh_fid), rc);
- }
+ /* track all UID/GID changes via llog */
+ rc = osp_sync_declare_add(env, o, MDS_SETATTR64_REC, th);
- return rc;
+ return 0;
}
/**
* \param[in] dt pointer to the OSP layer dt_object
* \param[in] attr pointer to the attribute to be set
* \param[in] th pointer to the transaction handler
- * \param[in] capa the capability for this operation
*
* \retval 0 for success
* \retval negative error number on failure
*/
static int osp_attr_set(const struct lu_env *env, struct dt_object *dt,
- const struct lu_attr *attr, struct thandle *th,
- struct lustre_capa *capa)
+ const struct lu_attr *attr, struct thandle *th)
{
struct osp_object *o = dt2osp_obj(dt);
int rc = 0;
ENTRY;
- if (is_only_remote_trans(th)) {
- rc = __osp_attr_set(env, dt, attr, th);
+ /* we're interested in uid/gid changes only */
+ if (!(attr->la_valid & (LA_UID | LA_GID)))
+ RETURN(0);
+
+ if (!is_only_remote_trans(th)) {
+ rc = osp_sync_add(env, o, MDS_SETATTR64_REC, th, attr);
+ /* XXX: send new uid/gid to OST ASAP? */
+ } else {
+ struct lu_attr *la;
+ /* It is for OST-object attr_set directly without updating
+ * local MDT-object attribute. It is usually used by LFSCK. */
+ rc = osp_md_attr_set(env, dt, attr, th);
CDEBUG(D_INFO, "(1) set attr "DFID": rc = %d\n",
PFID(&dt->do_lu.lo_header->loh_fid), rc);
- RETURN(rc);
- }
-
- /* we're interested in uid/gid changes only */
- if (!(attr->la_valid & (LA_UID | LA_GID)))
- RETURN(0);
+ if (rc != 0 || o->opo_ooa == NULL)
+ RETURN(rc);
- rc = osp_sync_add(env, o, MDS_SETATTR64_REC, th, attr);
- /* XXX: send new uid/gid to OST ASAP? */
+ /* Update the OSP object attributes cache. */
+ la = &o->opo_ooa->ooa_attr;
+ spin_lock(&o->opo_lock);
+ if (attr->la_valid & LA_UID) {
+ la->la_uid = attr->la_uid;
+ la->la_valid |= LA_UID;
+ }
- CDEBUG(D_INFO, "(2) set attr "DFID": rc = %d\n",
- PFID(&dt->do_lu.lo_header->loh_fid), rc);
+ if (attr->la_valid & LA_GID) {
+ la->la_gid = attr->la_gid;
+ la->la_valid |= LA_GID;
+ }
+ spin_unlock(&o->opo_lock);
+ }
RETURN(rc);
}
* \param[in] dt pointer to the OSP layer dt_object
* \param[out] buf pointer to the lu_buf to hold the extended attribute
* \param[in] name the name for the expected extended attribute
- * \param[in] capa the capability for this operation
*
* \retval 0 for success
* \retval negative error number on failure
*/
static int osp_declare_xattr_get(const struct lu_env *env, struct dt_object *dt,
- struct lu_buf *buf, const char *name,
- struct lustre_capa *capa)
+ struct lu_buf *buf, const char *name)
{
struct osp_object *obj = dt2osp_obj(dt);
struct osp_device *osp = lu2osp_dev(dt->do_lu.lo_dev);
* \param[in] dt pointer to the OSP layer dt_object
* \param[out] buf pointer to the lu_buf to hold the extended attribute
* \param[in] name the name for the expected extended attribute
- * \param[in] capa the capability for this operation
*
* \retval 0 for success
* \retval negative error number on failure
*/
int osp_xattr_get(const struct lu_env *env, struct dt_object *dt,
- struct lu_buf *buf, const char *name,
- struct lustre_capa *capa)
+ struct lu_buf *buf, const char *name)
{
struct osp_device *osp = lu2osp_dev(dt->do_lu.lo_dev);
struct osp_object *obj = dt2osp_obj(dt);
GOTO(out, rc);
}
- rc = out_remote_sync(env, osp->opd_obd->u.cli.cl_import, update, &req);
+ rc = osp_remote_sync(env, osp, update, &req);
if (rc != 0) {
if (rc == -ENOENT) {
dt->do_lu.lo_header->loh_attr &= ~LOHA_EXISTS;
return rc;
}
-static int __osp_xattr_set(const struct lu_env *env, struct dt_object *dt,
- const struct lu_buf *buf, const char *name,
- int flag, struct thandle *th)
-{
- struct osp_object *o = dt2osp_obj(dt);
- struct dt_update_request *update;
- struct osp_xattr_entry *oxe;
- int rc;
- ENTRY;
-
- LASSERT(buf->lb_len > 0 && buf->lb_buf != NULL);
-
- update = dt_update_request_find_or_create(th, dt);
- if (IS_ERR(update)) {
- CERROR("%s: Get OSP update buf failed "DFID": rc = %d\n",
- dt->do_lu.lo_dev->ld_obd->obd_name,
- PFID(lu_object_fid(&dt->do_lu)),
- (int)PTR_ERR(update));
-
- RETURN(PTR_ERR(update));
- }
-
- rc = out_xattr_set_pack(env, &update->dur_buf,
- lu_object_fid(&dt->do_lu),
- buf, name, flag, update->dur_batchid);
- if (rc != 0 || o->opo_ooa == NULL)
- RETURN(rc);
-
- oxe = osp_oac_xattr_find_or_add(o, name, buf->lb_len);
- if (oxe == NULL) {
- CWARN("%s: cannot cache xattr '%s' of "DFID"\n",
- dt->do_lu.lo_dev->ld_obd->obd_name,
- name, PFID(lu_object_fid(&dt->do_lu)));
-
- RETURN(0);
- }
-
- if (oxe->oxe_buflen - oxe->oxe_namelen - 1 < buf->lb_len) {
- struct osp_xattr_entry *old = oxe;
- struct osp_xattr_entry *tmp;
-
- tmp = osp_oac_xattr_replace(o, &old, buf->lb_len);
- osp_oac_xattr_put(oxe);
- oxe = tmp;
- if (tmp == NULL) {
- CWARN("%s: cannot update cached xattr '%s' of "DFID"\n",
- dt->do_lu.lo_dev->ld_obd->obd_name,
- name, PFID(lu_object_fid(&dt->do_lu)));
- spin_lock(&o->opo_lock);
- old->oxe_ready = 0;
- spin_unlock(&o->opo_lock);
-
- RETURN(0);
- }
-
- /* Drop the ref for entry on list. */
- osp_oac_xattr_put(old);
- }
-
- spin_lock(&o->opo_lock);
- oxe->oxe_vallen = buf->lb_len;
- memcpy(oxe->oxe_value, buf->lb_buf, buf->lb_len);
- oxe->oxe_exist = 1;
- oxe->oxe_ready = 1;
- spin_unlock(&o->opo_lock);
- osp_oac_xattr_put(oxe);
-
- RETURN(0);
-}
-
/**
* Implement OSP layer dt_object_operations::do_declare_xattr_set() interface.
*
const struct lu_buf *buf, const char *name,
int flag, struct thandle *th)
{
- int rc = 0;
-
- if (!is_only_remote_trans(th)) {
- rc = __osp_xattr_set(env, dt, buf, name, flag, th);
-
- CDEBUG(D_INFO, "declare xattr %s set object "DFID": rc = %d\n",
- name, PFID(&dt->do_lu.lo_header->loh_fid), rc);
- }
-
- return rc;
+ return osp_trans_update_request_create(th);
}
/**
*
* Set extended attribute to the specified MDT/OST object.
*
- * If it is remote transaction, it will add an OUT_XATTR_SET sub-request into
- * the OUT RPC that will be flushed when the transaction stop. And if the OSP
- * attributes cache is initialized, then check whether the name extended
- * attribute entry exists in the cache or not. If yes, replace it; otherwise,
- * add the extended attribute to the cache.
+ * Add an OUT_XATTR_SET sub-request into the OUT RPC that will be flushed in
+ * the transaction stop. And if the OSP attributes cache is initialized, then
+ * check whether the name extended attribute entry exists in the cache or not.
+ * If yes, replace it; otherwise, add the extended attribute to the cache.
*
* \param[in] env pointer to the thread context
* \param[in] dt pointer to the OSP layer dt_object
* \param[in] fl to indicate the detailed set operation: LU_XATTR_CREATE
* or LU_XATTR_REPLACE or others
* \param[in] th pointer to the transaction handler
- * \param[in] capa the capability for this operation
*
* \retval 0 for success
* \retval negative error number on failure
*/
int osp_xattr_set(const struct lu_env *env, struct dt_object *dt,
const struct lu_buf *buf, const char *name, int fl,
- struct thandle *th, struct lustre_capa *capa)
+ struct thandle *th)
{
- int rc = 0;
+ struct osp_object *o = dt2osp_obj(dt);
+ struct dt_update_request *update;
+ struct osp_xattr_entry *oxe;
+ int rc;
+ ENTRY;
- if (is_only_remote_trans(th)) {
- rc = __osp_xattr_set(env, dt, buf, name, fl, th);
+ LASSERT(buf->lb_len > 0 && buf->lb_buf != NULL);
+ update = thandle_to_dt_update_request(th);
+ LASSERT(update != NULL);
- CDEBUG(D_INFO, "xattr %s set object "DFID": rc = %d\n",
- name, PFID(&dt->do_lu.lo_header->loh_fid), rc);
- }
+ CDEBUG(D_INODE, DFID" set xattr '%s' with size %zd\n",
+ PFID(lu_object_fid(&dt->do_lu)), name, buf->lb_len);
- return rc;
-}
+ rc = out_xattr_set_pack(env, &update->dur_buf,
+ lu_object_fid(&dt->do_lu),
+ buf, name, fl, update->dur_batchid);
+ if (rc != 0 || o->opo_ooa == NULL)
+ return rc;
-static int __osp_xattr_del(const struct lu_env *env, struct dt_object *dt,
- const char *name, struct thandle *th)
-{
- struct dt_update_request *update;
- const struct lu_fid *fid;
- struct osp_object *o = dt2osp_obj(dt);
- struct osp_xattr_entry *oxe;
- int rc;
+ oxe = osp_oac_xattr_find_or_add(o, name, buf->lb_len);
+ if (oxe == NULL) {
+ CWARN("%s: cannot cache xattr '%s' of "DFID"\n",
+ dt->do_lu.lo_dev->ld_obd->obd_name,
+ name, PFID(lu_object_fid(&dt->do_lu)));
- update = dt_update_request_find_or_create(th, dt);
- if (IS_ERR(update))
- return PTR_ERR(update);
+ RETURN(0);
+ }
- fid = lu_object_fid(&dt->do_lu);
+ if (oxe->oxe_buflen - oxe->oxe_namelen - 1 < buf->lb_len) {
+ struct osp_xattr_entry *old = oxe;
+ struct osp_xattr_entry *tmp;
- rc = out_xattr_del_pack(env, &update->dur_buf, fid, name,
- update->dur_batchid);
+ tmp = osp_oac_xattr_replace(o, &old, buf->lb_len);
+ osp_oac_xattr_put(oxe);
+ oxe = tmp;
+ if (tmp == NULL) {
+ CWARN("%s: cannot update cached xattr '%s' of "DFID"\n",
+ dt->do_lu.lo_dev->ld_obd->obd_name,
+ name, PFID(lu_object_fid(&dt->do_lu)));
+ spin_lock(&o->opo_lock);
+ old->oxe_ready = 0;
+ spin_unlock(&o->opo_lock);
- if (rc != 0 || o->opo_ooa == NULL)
- return rc;
+ RETURN(0);
+ }
- oxe = osp_oac_xattr_find(o, name, true);
- if (oxe != NULL)
/* Drop the ref for entry on list. */
- osp_oac_xattr_put(oxe);
+ osp_oac_xattr_put(old);
+ }
- return 0;
+ spin_lock(&o->opo_lock);
+ oxe->oxe_vallen = buf->lb_len;
+ memcpy(oxe->oxe_value, buf->lb_buf, buf->lb_len);
+ oxe->oxe_exist = 1;
+ oxe->oxe_ready = 1;
+ spin_unlock(&o->opo_lock);
+ osp_oac_xattr_put(oxe);
+
+ RETURN(0);
}
/**
int osp_declare_xattr_del(const struct lu_env *env, struct dt_object *dt,
const char *name, struct thandle *th)
{
- int rc = 0;
-
- if (!is_only_remote_trans(th)) {
- rc = __osp_xattr_del(env, dt, name, th);
-
- CDEBUG(D_INFO, "declare xattr %s del object "DFID": rc = %d\n",
- name, PFID(&dt->do_lu.lo_header->loh_fid), rc);
- }
-
- return rc;
+ return osp_trans_update_request_create(th);
}
/**
* \param[in] dt pointer to the OSP layer dt_object
* \param[in] name the name of the extended attribute to be set
* \param[in] th pointer to the transaction handler
- * \param[in] capa the capability for this operation
*
* \retval 0 for success
* \retval negative error number on failure
*/
int osp_xattr_del(const struct lu_env *env, struct dt_object *dt,
- const char *name, struct thandle *th,
- struct lustre_capa *capa)
+ const char *name, struct thandle *th)
{
- int rc = 0;
+ struct dt_update_request *update;
+ const struct lu_fid *fid = lu_object_fid(&dt->do_lu);
+ struct osp_object *o = dt2osp_obj(dt);
+ struct osp_xattr_entry *oxe;
+ int rc;
- if (is_only_remote_trans(th)) {
- rc = __osp_xattr_del(env, dt, name, th);
+ update = thandle_to_dt_update_request(th);
+ LASSERT(update != NULL);
- CDEBUG(D_INFO, "xattr %s del object "DFID": rc = %d\n",
- name, PFID(&dt->do_lu.lo_header->loh_fid), rc);
- }
+ rc = out_xattr_del_pack(env, &update->dur_buf, fid, name,
+ update->dur_batchid);
+ if (rc != 0 || o->opo_ooa == NULL)
+ return rc;
- return rc;
+ oxe = osp_oac_xattr_find(o, name, true);
+ if (oxe != NULL)
+ /* Drop the ref for entry on list. */
+ osp_oac_xattr_put(oxe);
+
+ return 0;
}
/**
struct osp_device *d = lu2osp_dev(dt->do_lu.lo_dev);
struct osp_object *o = dt2osp_obj(dt);
const struct lu_fid *fid = lu_object_fid(&dt->do_lu);
+ struct thandle *local_th;
int rc = 0;
ENTRY;
*/
/* rc = osp_sync_declare_add(env, o, MDS_UNLINK64_REC, th); */
+ local_th = osp_get_storage_thandle(env, th, d);
+ if (IS_ERR(local_th))
+ RETURN(PTR_ERR(local_th));
+
if (unlikely(!fid_is_zero(fid))) {
/* replay case: caller knows fid */
osi->osi_off = sizeof(osi->osi_id) * d->opd_index;
osi->osi_lb.lb_len = sizeof(osi->osi_id);
osi->osi_lb.lb_buf = NULL;
+
rc = dt_declare_record_write(env, d->opd_last_used_oid_file,
- &osi->osi_lb, osi->osi_off, th);
+ &osi->osi_lb, osi->osi_off,
+ local_th);
RETURN(rc);
}
osi->osi_lb.lb_len = sizeof(osi->osi_id);
osi->osi_lb.lb_buf = NULL;
rc = dt_declare_record_write(env, d->opd_last_used_oid_file,
- &osi->osi_lb, osi->osi_off, th);
+ &osi->osi_lb, osi->osi_off,
+ local_th);
} else {
/* not needed in the cache anymore */
set_bit(LU_OBJECT_HEARD_BANSHEE,
struct osp_object *o = dt2osp_obj(dt);
int rc = 0;
struct lu_fid *fid = &osi->osi_fid;
+ struct thandle *local_th;
ENTRY;
if (is_only_remote_trans(th) &&
if (osp_precreate_end_seq(env, d) && osp_is_fid_client(d))
th->th_sync = 1;
+ local_th = osp_get_storage_thandle(env, th, d);
+ if (IS_ERR(local_th))
+ RETURN(PTR_ERR(local_th));
/*
* it's OK if the import is inactive by this moment - id was created
* by OST earlier, we just need to maintain it consistently on the disk
&d->opd_last_used_fid.f_oid, d->opd_index);
rc = dt_record_write(env, d->opd_last_used_oid_file, &osi->osi_lb,
- &osi->osi_off, th);
+ &osi->osi_off, local_th);
CDEBUG(D_HA, "%s: Wrote last used FID: "DFID", index %d: %d\n",
d->opd_obd->obd_name, PFID(fid), d->opd_index, rc);
struct dt_object *dt, struct thandle *th)
{
struct osp_object *o = dt2osp_obj(dt);
+ struct osp_device *osp = lu2osp_dev(dt->do_lu.lo_dev);
int rc = 0;
ENTRY;
- /*
- * track objects to be destroyed via llog
- */
+ LASSERT(!osp->opd_connect_mdt);
rc = osp_sync_declare_add(env, o, MDS_UNLINK64_REC, th);
RETURN(rc);
* \retval 0 for success
* \retval negative error number on failure
*/
-int osp_object_destroy(const struct lu_env *env, struct dt_object *dt,
- struct thandle *th)
+static int osp_object_destroy(const struct lu_env *env, struct dt_object *dt,
+ struct thandle *th)
{
struct osp_object *o = dt2osp_obj(dt);
+ struct osp_device *osp = lu2osp_dev(dt->do_lu.lo_dev);
int rc = 0;
ENTRY;
-
o->opo_non_exist = 1;
- /*
- * once transaction is committed put proper command on
- * the queue going to our OST
- */
+
+ LASSERT(!osp->opd_connect_mdt);
+ /* once transaction is committed put proper command on
+ * the queue going to our OST. */
rc = osp_sync_add(env, o, MDS_UNLINK64_REC, th, NULL);
+ if (rc < 0)
+ RETURN(rc);
/* not needed in cache any more */
set_bit(LU_OBJECT_HEARD_BANSHEE, &dt->do_lu.lo_header->loh_flags);
static int osp_orphan_index_lookup(const struct lu_env *env,
struct dt_object *dt,
struct dt_rec *rec,
- const struct dt_key *key,
- struct lustre_capa *capa)
+ const struct dt_key *key)
{
return -EOPNOTSUPP;
}
const struct dt_rec *rec,
const struct dt_key *key,
struct thandle *handle,
- struct lustre_capa *capa,
int ignore_quota)
{
return -EOPNOTSUPP;
static int osp_orphan_index_delete(const struct lu_env *env,
struct dt_object *dt,
const struct dt_key *key,
- struct thandle *handle,
- struct lustre_capa *capa)
+ struct thandle *handle)
{
return -EOPNOTSUPP;
}
* \param[in] env pointer to the thread context
* \param[in] dt pointer to the index object to be iterated
* \param[in] attr unused
- * \param[in] capa the capability for this operation
*
* \retval pointer to the iteration structure
* \retval negative error number on failure
*/
struct dt_it *osp_it_init(const struct lu_env *env, struct dt_object *dt,
- __u32 attr, struct lustre_capa *capa)
+ __u32 attr)
{
struct osp_it *it;
po->opo_obj.do_ops = &osp_md_obj_ops;
po->opo_obj.do_body_ops = &osp_md_body_ops;
- rc = po->opo_obj.do_ops->do_attr_get(env, lu2dt_obj(o),
- la, NULL);
+ rc = po->opo_obj.do_ops->do_attr_get(env, lu2dt_obj(o), la);
if (rc == 0)
o->lo_header->loh_attr |=
LOHA_EXISTS | (la->la_mode & S_IFMT);
git://git.whamcloud.com / fs / lustre-release.git / blobdiff