* GPL HEADER END
*/
/*
- * Copyright (c) 2014, Intel Corporation.
+ * Copyright (c) 2015, 2017, Intel Corporation.
*/
/*
* lustre/lod/lod_sub_object.c
#include <obd.h>
#include <obd_class.h>
-#include <lustre_ver.h>
+#include <uapi/linux/lustre/lustre_ver.h>
#include <obd_support.h>
#include <lprocfs_status.h>
#include <lustre_fid.h>
-#include <lustre_param.h>
+#include <uapi/linux/lustre/lustre_param.h>
#include <md_object.h>
#include <lustre_linkea.h>
#include <lustre_log.h>
RETURN(th);
tth = container_of(th, struct top_thandle, tt_super);
+ tth->tt_master_sub_thandle->th_ignore_quota = th->th_ignore_quota;
/* local object must be mdt object, Note: during ost object
- * creation, FID is not assigned until osp_object_create(),
+ * creation, FID is not assigned until osp_create(),
* so if the FID of sub_obj is zero, it means OST object. */
if (!dt_object_remote(sub_obj) ||
fid_is_zero(lu_object_fid(&sub_obj->do_lu))) {
if (rc < 0)
RETURN(ERR_PTR(rc));
- if (type == LU_SEQ_RANGE_OST)
+ /* th_complex means we need track all of updates for this
+ * transaction, include changes on OST */
+ if (type == LU_SEQ_RANGE_OST && !th->th_complex)
RETURN(tth->tt_master_sub_thandle);
sub_th = thandle_get_sub(env, th, sub_obj);
if (IS_ERR(sub_th))
RETURN(sub_th);
+ sub_th->th_ignore_quota = th->th_ignore_quota;
if (tth->tt_multiple_thandle != NULL && record_update != NULL &&
th->th_result == 0)
* \retval 0 if the declaration succeeds
* \retval negative errno if the declaration fails.
*/
-int lod_sub_object_declare_create(const struct lu_env *env,
- struct dt_object *dt,
- struct lu_attr *attr,
- struct dt_allocation_hint *hint,
- struct dt_object_format *dof,
- struct thandle *th)
+int lod_sub_declare_create(const struct lu_env *env, struct dt_object *dt,
+ struct lu_attr *attr,
+ struct dt_allocation_hint *hint,
+ struct dt_object_format *dof, struct thandle *th)
{
struct thandle *sub_th;
bool record_update;
* \retval 0 if the creation succeeds
* \retval negative errno if the creation fails.
*/
-int lod_sub_object_create(const struct lu_env *env, struct dt_object *dt,
- struct lu_attr *attr,
- struct dt_allocation_hint *hint,
- struct dt_object_format *dof,
- struct thandle *th)
+int lod_sub_create(const struct lu_env *env, struct dt_object *dt,
+ struct lu_attr *attr, struct dt_allocation_hint *hint,
+ struct dt_object_format *dof, struct thandle *th)
{
struct thandle *sub_th;
bool record_update;
* \retval 0 if the declaration succeeds.
* \retval negative errno if the declaration fails.
*/
-int lod_sub_object_declare_ref_add(const struct lu_env *env,
- struct dt_object *dt,
- struct thandle *th)
+int lod_sub_declare_ref_add(const struct lu_env *env, struct dt_object *dt,
+ struct thandle *th)
{
struct thandle *sub_th;
bool record_update;
* \retval 0 if it succeeds.
* \retval negative errno if it fails.
*/
-int lod_sub_object_ref_add(const struct lu_env *env, struct dt_object *dt,
- struct thandle *th)
+int lod_sub_ref_add(const struct lu_env *env, struct dt_object *dt,
+ struct thandle *th)
{
struct thandle *sub_th;
bool record_update;
* \retval 0 if the declaration succeeds.
* \retval negative errno if the declaration fails.
*/
-int lod_sub_object_declare_ref_del(const struct lu_env *env,
- struct dt_object *dt,
- struct thandle *th)
+int lod_sub_declare_ref_del(const struct lu_env *env, struct dt_object *dt,
+ struct thandle *th)
{
struct thandle *sub_th;
bool record_update;
* \retval 0 if it succeeds.
* \retval negative errno if it fails.
*/
-int lod_sub_object_ref_del(const struct lu_env *env, struct dt_object *dt,
- struct thandle *th)
+int lod_sub_ref_del(const struct lu_env *env, struct dt_object *dt,
+ struct thandle *th)
{
struct thandle *sub_th;
bool record_update;
* \retval 0 if the declaration succeeds.
* \retval negative errno if the declaration fails.
*/
-int lod_sub_object_declare_destroy(const struct lu_env *env,
- struct dt_object *dt,
- struct thandle *th)
+int lod_sub_declare_destroy(const struct lu_env *env, struct dt_object *dt,
+ struct thandle *th)
{
struct thandle *sub_th;
bool record_update;
RETURN(PTR_ERR(sub_th));
if (record_update)
- update_record_size(env, object_destroy, th,
- lu_object_fid(&dt->do_lu));
+ update_record_size(env, destroy, th, lu_object_fid(&dt->do_lu));
rc = dt_declare_destroy(env, dt, sub_th);
* \retval 0 if the destroy succeeds.
* \retval negative errno if the destroy fails.
*/
-int lod_sub_object_destroy(const struct lu_env *env, struct dt_object *dt,
- struct thandle *th)
+int lod_sub_destroy(const struct lu_env *env, struct dt_object *dt,
+ struct thandle *th)
{
struct thandle *sub_th;
bool record_update;
RETURN(PTR_ERR(sub_th));
if (record_update) {
- rc = update_record_pack(object_destroy, th,
- lu_object_fid(&dt->do_lu));
+ rc = update_record_pack(destroy, th, lu_object_fid(&dt->do_lu));
if (rc < 0)
RETURN(rc);
}
* \retval 0 if the declaration succeeds.
* \retval negative errno if the declaration fails.
*/
-int lod_sub_object_declare_insert(const struct lu_env *env,
- struct dt_object *dt,
- const struct dt_rec *rec,
- const struct dt_key *key,
- struct thandle *th)
+int lod_sub_declare_insert(const struct lu_env *env, struct dt_object *dt,
+ const struct dt_rec *rec,
+ const struct dt_key *key, struct thandle *th)
{
struct thandle *sub_th;
bool record_update;
* \param[in] rec record of the index to be inserted
* \param[in] key key of the index to be inserted
* \param[in] th the transaction handle
- * \param[in] ign whether ignore quota
*
* \retval 0 if the insertion succeeds.
* \retval negative errno if the insertion fails.
*/
-int lod_sub_object_index_insert(const struct lu_env *env, struct dt_object *dt,
- const struct dt_rec *rec,
- const struct dt_key *key, struct thandle *th,
- int ign)
+int lod_sub_insert(const struct lu_env *env, struct dt_object *dt,
+ const struct dt_rec *rec, const struct dt_key *key,
+ struct thandle *th)
{
struct thandle *sub_th;
int rc;
return rc;
}
- return dt_insert(env, dt, rec, key, sub_th, ign);
+ return dt_insert(env, dt, rec, key, sub_th);
}
/**
* \retval 0 if the declaration succeeds.
* \retval negative errno if the declaration fails.
*/
-int lod_sub_object_declare_delete(const struct lu_env *env,
- struct dt_object *dt,
- const struct dt_key *key,
- struct thandle *th)
+int lod_sub_declare_delete(const struct lu_env *env, struct dt_object *dt,
+ const struct dt_key *key, struct thandle *th)
{
struct thandle *sub_th;
bool record_update;
* \retval 0 if the deletion succeeds.
* \retval negative errno if the deletion fails.
*/
-int lod_sub_object_delete(const struct lu_env *env, struct dt_object *dt,
- const struct dt_key *name, struct thandle *th)
+int lod_sub_delete(const struct lu_env *env, struct dt_object *dt,
+ const struct dt_key *name, struct thandle *th)
{
struct thandle *sub_th;
bool record_update;
* \retval 0 if the declaration succeeds.
* \retval negative errno if the declaration fails.
*/
-int lod_sub_object_declare_xattr_set(const struct lu_env *env,
- struct dt_object *dt,
- const struct lu_buf *buf,
- const char *name, int fl,
- struct thandle *th)
+int lod_sub_declare_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 thandle *sub_th;
bool record_update;
* \retval 0 if the xattr setting succeeds.
* \retval negative errno if xattr setting fails.
*/
-int lod_sub_object_xattr_set(const struct lu_env *env, struct dt_object *dt,
- const struct lu_buf *buf, const char *name, int fl,
- struct thandle *th)
+int lod_sub_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 thandle *sub_th;
bool record_update;
* \retval 0 if the declaration succeeds.
* \retval negative errno if the declaration fails.
*/
-int lod_sub_object_declare_attr_set(const struct lu_env *env,
- struct dt_object *dt,
- const struct lu_attr *attr,
- struct thandle *th)
+int lod_sub_declare_attr_set(const struct lu_env *env, struct dt_object *dt,
+ const struct lu_attr *attr, struct thandle *th)
{
struct thandle *sub_th;
bool record_update;
* \retval 0 if attributes setting succeeds.
* \retval negative errno if the attributes setting fails.
*/
-int lod_sub_object_attr_set(const struct lu_env *env,
- struct dt_object *dt,
- const struct lu_attr *attr,
- struct thandle *th)
+int lod_sub_attr_set(const struct lu_env *env, struct dt_object *dt,
+ const struct lu_attr *attr, struct thandle *th)
{
bool record_update;
struct thandle *sub_th;
* \retval 0 if the declaration succeeds.
* \retval negative errno if the declaration fails.
*/
-int lod_sub_object_declare_xattr_del(const struct lu_env *env,
- struct dt_object *dt,
- const char *name,
- struct thandle *th)
+int lod_sub_declare_xattr_del(const struct lu_env *env, struct dt_object *dt,
+ const char *name, struct thandle *th)
{
struct thandle *sub_th;
bool record_update;
* \retval 0 if the deletion succeeds.
* \retval negative errno if the deletion fails.
*/
-int lod_sub_object_xattr_del(const struct lu_env *env,
- struct dt_object *dt,
- const char *name,
- struct thandle *th)
+int lod_sub_xattr_del(const struct lu_env *env, struct dt_object *dt,
+ const char *name, struct thandle *th)
{
struct thandle *sub_th;
bool record_update;
* \retval 0 if the insertion succeeds.
* \retval negative errno if the insertion fails.
*/
-int lod_sub_object_declare_write(const struct lu_env *env,
- struct dt_object *dt,
- const struct lu_buf *buf, loff_t pos,
- struct thandle *th)
+int lod_sub_declare_write(const struct lu_env *env, struct dt_object *dt,
+ const struct lu_buf *buf, loff_t pos,
+ struct thandle *th)
{
struct thandle *sub_th;
bool record_update;
* \param[in] buf buffer to write which includes an embedded size field
* \param[in] pos offet in the object to start writing at
* \param[in] th transaction handle
- * \param[in] rq enforcement for this write
*
* \retval the buffer size in bytes if it succeeds.
* \retval negative errno if it fails.
*/
-ssize_t lod_sub_object_write(const struct lu_env *env, struct dt_object *dt,
- const struct lu_buf *buf, loff_t *pos,
- struct thandle *th, int rq)
+ssize_t lod_sub_write(const struct lu_env *env, struct dt_object *dt,
+ const struct lu_buf *buf, loff_t *pos,
+ struct thandle *th)
{
struct thandle *sub_th;
bool record_update;
RETURN(rc);
}
- rc = dt_write(env, dt, buf, pos, sub_th, rq);
+ rc = dt_write(env, dt, buf, pos, sub_th);
RETURN(rc);
}
* \retval 0 if the insertion succeeds.
* \retval negative errno if the insertion fails.
*/
-int lod_sub_object_declare_punch(const struct lu_env *env,
- struct dt_object *dt,
- __u64 start, __u64 end,
- struct thandle *th)
+int lod_sub_declare_punch(const struct lu_env *env, struct dt_object *dt,
+ __u64 start, __u64 end, struct thandle *th)
{
struct thandle *sub_th;
bool record_update;
* \retval the buffer size in bytes if it succeeds.
* \retval negative errno if it fails.
*/
-int lod_sub_object_punch(const struct lu_env *env, struct dt_object *dt,
- __u64 start, __u64 end, struct thandle *th)
+int lod_sub_punch(const struct lu_env *env, struct dt_object *dt,
+ __u64 start, __u64 end, struct thandle *th)
{
struct thandle *sub_th;
bool record_update;
}
LASSERT(lgh != NULL);
- ctxt->loc_handle = lgh;
- rc = llog_cat_init_and_process(env, lgh);
+ rc = llog_init_handle(env, lgh, LLOG_F_IS_CAT, NULL);
if (rc != 0)
GOTO(out_close, rc);
GOTO(out_close, rc);
}
- CDEBUG(D_INFO, "%s: Init llog for %d - catid "DOSTID":%x\n",
- obd->obd_name, index, POSTID(&cid->lci_logid.lgl_oi),
+ ctxt->loc_handle = lgh;
+
+ CDEBUG(D_INFO, "%s: init llog for index %d - catid "DFID":%x\n",
+ obd->obd_name, index, PFID(&cid->lci_logid.lgl_oi.oi_fid),
cid->lci_logid.lgl_ogen);
out_close:
- if (rc != 0) {
- llog_cat_close(env, ctxt->loc_handle);
- ctxt->loc_handle = NULL;
- }
-
+ if (rc != 0)
+ llog_cat_close(env, lgh);
out_put:
llog_ctxt_put(ctxt);
RETURN(rc);
git://git.whamcloud.com / fs / lustre-release.git / blobdiff