Avoid serious confusion with the MDT mti_big_buf, and other fields
in mdd_thread_info, since they are two separate buffers completely.
mti_big_buf->mdi_big_buf
mti_chlg_buf->mdi_chlg_buf
mti_link_buf->mdi_link_buf
mti_xattr_buf->mdi_xattr_buf
The first patch of several to rename all mdd_thread_info fields.
Test-Parameters: trivial
Signed-off-by: Andreas Dilger <adilger@whamcloud.com>
Change-Id: Ib0ec91c8481e747ed058afe5c08c3f60203ebbe5
Reviewed-on: https://review.whamcloud.com/43738
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Mike Pershin <mpershin@whamcloud.com>
Reviewed-by: Arshad Hussain <arshad.hussain@aeoncomputing.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>
\bMIN\(||min_t
mdo2fid||mdd_object_fid
mktemp||mkstemp
\bMIN\(||min_t
mdo2fid||mdd_object_fid
mktemp||mkstemp
+mti_chlg_buf||mdi_chlg_buf
+mti_link_buf||mdi_link_buf
+mti_xattr_buf||mdi_xattr_buf
OS_STATE_DEGRADED||OS_STATFS_DEGRADED
OS_STATE_READONLY||OS_STATFS_READONLY
OS_STATE_NOPRECREATE||OS_STATFS_NOPRECREATE
OS_STATE_DEGRADED||OS_STATFS_DEGRADED
OS_STATE_READONLY||OS_STATFS_READONLY
OS_STATE_NOPRECREATE||OS_STATFS_NOPRECREATE
}
reclen = llog_data_len(sizeof(*rec) + len);
}
reclen = llog_data_len(sizeof(*rec) + len);
- buf = lu_buf_check_and_alloc(&mdd_env_info(env)->mti_chlg_buf, reclen);
+ buf = lu_buf_check_and_alloc(&mdd_env_info(env)->mdi_chlg_buf, reclen);
if (buf->lb_buf == NULL)
RETURN(-ENOMEM);
rec = buf->lb_buf;
if (buf->lb_buf == NULL)
RETURN(-ENOMEM);
rec = buf->lb_buf;
{
struct mdd_thread_info *info = data;
{
struct mdd_thread_info *info = data;
- lu_buf_free(&info->mti_big_buf);
- lu_buf_free(&info->mti_link_buf);
- lu_buf_free(&info->mti_xattr_buf);
- lu_buf_free(&info->mti_chlg_buf);
+ lu_buf_free(&info->mdi_big_buf);
+ lu_buf_free(&info->mdi_link_buf);
+ lu_buf_free(&info->mdi_xattr_buf);
+ lu_buf_free(&info->mdi_chlg_buf);
}
/** Read the link EA into a temp buffer.
}
/** Read the link EA into a temp buffer.
- * Uses the mdd_thread_info::mti_link_buf since it is generally large.
+ * Uses the mdd_thread_info::mdi_link_buf since it is generally large.
* A pointer to the buffer is stored in \a ldata::ld_buf.
*
* \retval 0 or error
* A pointer to the buffer is stored in \a ldata::ld_buf.
*
* \retval 0 or error
/* First try a small buf */
LASSERT(env != NULL);
/* First try a small buf */
LASSERT(env != NULL);
- ldata->ld_buf = lu_buf_check_and_alloc(&mdd_env_info(env)->mti_link_buf,
+ ldata->ld_buf = lu_buf_check_and_alloc(&mdd_env_info(env)->mdi_link_buf,
PAGE_SIZE);
if (ldata->ld_buf->lb_buf == NULL)
return -ENOMEM;
PAGE_SIZE);
if (ldata->ld_buf->lb_buf == NULL)
return -ENOMEM;
const struct lu_attr *attr,
struct lu_fid *fid)
{
const struct lu_attr *attr,
struct lu_fid *fid)
{
- struct mdd_thread_info *info = mdd_env_info(env);
- struct linkea_data ldata = { NULL };
- struct lu_buf *buf = &info->mti_link_buf;
- struct lu_name lname;
- int rc = 0;
+ struct mdd_thread_info *info = mdd_env_info(env);
+ struct linkea_data ldata = { NULL };
+ struct lu_buf *buf = &info->mdi_link_buf;
+ struct lu_name lname;
+ int rc = 0;
LASSERT(handle != NULL);
reclen = mdd_llog_record_calc_size(env, tname, sname);
LASSERT(handle != NULL);
reclen = mdd_llog_record_calc_size(env, tname, sname);
- buf = lu_buf_check_and_alloc(&mdd_env_info(env)->mti_chlg_buf, reclen);
+ buf = lu_buf_check_and_alloc(&mdd_env_info(env)->mdi_chlg_buf, reclen);
if (buf->lb_buf == NULL)
RETURN(-ENOMEM);
rec = buf->lb_buf;
if (buf->lb_buf == NULL)
RETURN(-ENOMEM);
rec = buf->lb_buf;
if (rc != -ENODATA)
return rc;
rc = linkea_data_new(ldata,
if (rc != -ENODATA)
return rc;
rc = linkea_data_new(ldata,
- &mdd_env_info(env)->mti_link_buf);
+ &mdd_env_info(env)->mdi_link_buf);
/** Read the link EA into a temp buffer.
* Uses the name_buf since it is generally large.
* \retval IS_ERR err
/** Read the link EA into a temp buffer.
* Uses the name_buf since it is generally large.
* \retval IS_ERR err
- * \retval ptr to \a lu_buf (always \a mti_link_buf)
+ * \retval ptr to \a lu_buf (always \a mdi_link_buf)
*/
struct lu_buf *mdd_links_get(const struct lu_env *env,
struct mdd_object *mdd_obj)
*/
struct lu_buf *mdd_links_get(const struct lu_env *env,
struct mdd_object *mdd_obj)
}
static int mdd_link(const struct lu_env *env, struct md_object *tgt_obj,
}
static int mdd_link(const struct lu_env *env, struct md_object *tgt_obj,
- struct md_object *src_obj, const struct lu_name *lname,
- struct md_attr *ma)
+ struct md_object *src_obj, const struct lu_name *lname,
+ struct md_attr *ma)
- const char *name = lname->ln_name;
- struct lu_attr *la = &mdd_env_info(env)->mti_la_for_fix;
- struct mdd_object *mdd_tobj = md2mdd_obj(tgt_obj);
- struct mdd_object *mdd_sobj = md2mdd_obj(src_obj);
- struct lu_attr *cattr = MDD_ENV_VAR(env, cattr);
- struct lu_attr *tattr = MDD_ENV_VAR(env, tattr);
+ const char *name = lname->ln_name;
+ struct lu_attr *la = &mdd_env_info(env)->mti_la_for_fix;
+ struct mdd_object *mdd_tobj = md2mdd_obj(tgt_obj);
+ struct mdd_object *mdd_sobj = md2mdd_obj(src_obj);
+ struct lu_attr *cattr = MDD_ENV_VAR(env, cattr);
+ struct lu_attr *tattr = MDD_ENV_VAR(env, tattr);
struct mdd_device *mdd = mdo2mdd(src_obj);
struct thandle *handle;
struct lu_fid *tfid = &mdd_env_info(env)->mti_fid2;
struct mdd_device *mdd = mdo2mdd(src_obj);
struct thandle *handle;
struct lu_fid *tfid = &mdd_env_info(env)->mti_fid2;
GOTO(out_free, rc = PTR_ERR(handle));
use_bigger_buffer:
GOTO(out_free, rc = PTR_ERR(handle));
use_bigger_buffer:
- acl_buf = *lu_buf_check_and_alloc(&info->mti_xattr_buf, acl_size);
+ acl_buf = *lu_buf_check_and_alloc(&info->mdi_xattr_buf, acl_size);
if (!acl_buf.lb_buf)
GOTO(out_stop, rc = -ENOMEM);
if (!acl_buf.lb_buf)
GOTO(out_stop, rc = -ENOMEM);
- def_acl_buf = *lu_buf_check_and_alloc(&info->mti_big_buf, acl_size);
+ def_acl_buf = *lu_buf_check_and_alloc(&info->mdi_big_buf, acl_size);
if (!def_acl_buf.lb_buf)
GOTO(out_stop, rc = -ENOMEM);
if (!def_acl_buf.lb_buf)
GOTO(out_stop, rc = -ENOMEM);
if (list_xsize < 0)
RETURN(list_xsize);
if (list_xsize < 0)
RETURN(list_xsize);
- lu_buf_check_and_alloc(&info->mti_big_buf, list_xsize);
- if (info->mti_big_buf.lb_buf == NULL)
+ lu_buf_check_and_alloc(&info->mdi_big_buf, list_xsize);
+ if (info->mdi_big_buf.lb_buf == NULL)
- list_xbuf.lb_buf = info->mti_big_buf.lb_buf;
+ list_xbuf.lb_buf = info->mdi_big_buf.lb_buf;
list_xbuf.lb_len = list_xsize;
rc = mdo_xattr_list(env, sobj, &list_xbuf);
if (rc < 0)
list_xbuf.lb_len = list_xsize;
rc = mdo_xattr_list(env, sobj, &list_xbuf);
if (rc < 0)
char mti_key[NAME_MAX + 16];
int mti_flags;
char mti_name[NAME_MAX + 1];
char mti_key[NAME_MAX + 16];
int mti_flags;
char mti_name[NAME_MAX + 1];
- struct lu_buf mti_buf[4];
+ struct lu_buf mdi_buf[4];
/* persistent buffers, must be handled with lu_buf_alloc/free */
/* persistent buffers, must be handled with lu_buf_alloc/free */
- struct lu_buf mti_big_buf;
- struct lu_buf mti_chlg_buf;
- struct lu_buf mti_link_buf; /* buf for link ea */
- struct lu_buf mti_xattr_buf;
+ struct lu_buf mdi_big_buf;
+ struct lu_buf mdi_chlg_buf;
+ struct lu_buf mdi_link_buf; /* buf for link ea */
+ struct lu_buf mdi_xattr_buf;
struct obdo mti_oa;
struct dt_allocation_hint mti_hint;
struct dt_object_format mti_dof;
struct obdo mti_oa;
struct dt_allocation_hint mti_hint;
struct dt_object_format mti_dof;
- buf = &mdd_env_info(env)->mti_buf[0];
+ buf = &mdd_env_info(env)->mdi_buf[0];
buf->lb_buf = area;
buf->lb_len = len;
return buf;
buf->lb_buf = area;
buf->lb_len = len;
return buf;
- buf = &mdd_env_info(env)->mti_buf[0];
+ buf = &mdd_env_info(env)->mdi_buf[0];
buf->lb_buf = (void *)area;
buf->lb_len = len;
return buf;
buf->lb_buf = (void *)area;
buf->lb_len = len;
return buf;
reclen = llog_data_len(LLOG_CHANGELOG_HDR_SZ +
changelog_rec_offset(clf_flags & CLF_SUPPORTED,
xflags & CLFE_SUPPORTED));
reclen = llog_data_len(LLOG_CHANGELOG_HDR_SZ +
changelog_rec_offset(clf_flags & CLF_SUPPORTED,
xflags & CLFE_SUPPORTED));
- buf = lu_buf_check_and_alloc(&mdd_env_info(env)->mti_chlg_buf, reclen);
+ buf = lu_buf_check_and_alloc(&mdd_env_info(env)->mdi_chlg_buf, reclen);
if (buf->lb_buf == NULL)
RETURN(-ENOMEM);
rec = buf->lb_buf;
if (buf->lb_buf == NULL)
RETURN(-ENOMEM);
rec = buf->lb_buf;
RETURN(-ENOMEM);
/* Read HSM attrs from disk */
RETURN(-ENOMEM);
/* Read HSM attrs from disk */
- current_buf = lu_buf_check_and_alloc(&info->mti_xattr_buf,
+ current_buf = lu_buf_check_and_alloc(&info->mdi_xattr_buf,
min_t(unsigned int,
mdd_obj2mdd_dev(mdd_obj)->mdd_dt_conf.ddp_max_ea_size,
XATTR_SIZE_MAX));
min_t(unsigned int,
mdd_obj2mdd_dev(mdd_obj)->mdd_dt_conf.ddp_max_ea_size,
XATTR_SIZE_MAX));
struct mdd_device *mdd = mdo2mdd(md_obj);
struct mdd_object *obj = md2mdd_obj(md_obj);
struct mdd_object *vic = md2mdd_obj(md_vic);
struct mdd_device *mdd = mdo2mdd(md_obj);
struct mdd_object *obj = md2mdd_obj(md_obj);
struct mdd_object *vic = md2mdd_obj(md_vic);
- struct lu_buf *buf = &mdd_env_info(env)->mti_buf[0];
- struct lu_buf *buf_vic = &mdd_env_info(env)->mti_buf[1];
+ struct lu_buf *buf = &mdd_env_info(env)->mdi_buf[0];
+ struct lu_buf *buf_vic = &mdd_env_info(env)->mdi_buf[1];
struct lov_mds_md *lmm;
struct thandle *handle;
int rc;
struct lov_mds_md *lmm;
struct thandle *handle;
int rc;
struct mdd_device *mdd = mdo2mdd(md_obj);
struct mdd_object *obj = md2mdd_obj(md_obj);
struct mdd_object *vic = NULL;
struct mdd_device *mdd = mdo2mdd(md_obj);
struct mdd_object *obj = md2mdd_obj(md_obj);
struct mdd_object *vic = NULL;
- struct lu_buf *buf = &mdd_env_info(env)->mti_buf[0];
- struct lu_buf *buf_save = &mdd_env_info(env)->mti_buf[1];
- struct lu_buf *buf_vic = &mdd_env_info(env)->mti_buf[2];
+ struct lu_buf *buf = &mdd_env_info(env)->mdi_buf[0];
+ struct lu_buf *buf_save = &mdd_env_info(env)->mdi_buf[1];
+ struct lu_buf *buf_vic = &mdd_env_info(env)->mdi_buf[2];
struct lov_comp_md_v1 *lcm;
struct thandle *handle;
int rc;
struct lov_comp_md_v1 *lcm;
struct thandle *handle;
int rc;
int mdd_stripe_get(const struct lu_env *env, struct mdd_object *obj,
struct lu_buf *lmm_buf, const char *name)
{
int mdd_stripe_get(const struct lu_env *env, struct mdd_object *obj,
struct lu_buf *lmm_buf, const char *name)
{
- struct lu_buf *buf = &mdd_env_info(env)->mti_big_buf;
+ struct lu_buf *buf = &mdd_env_info(env)->mdi_big_buf;
repeat:
rc = mdo_xattr_get(env, obj, buf, name);
if (rc == -ERANGE) {
repeat:
rc = mdo_xattr_get(env, obj, buf, name);
if (rc == -ERANGE) {
- /* mti_big_buf is allocated but is too small
+ /* mdi_big_buf is allocated but is too small
* we need to increase it */
* we need to increase it */
- buf = lu_buf_check_and_alloc(&mdd_env_info(env)->mti_big_buf,
+ buf = lu_buf_check_and_alloc(&mdd_env_info(env)->mdi_big_buf,
buf->lb_len * 2);
if (buf->lb_buf == NULL)
RETURN(-ENOMEM);
buf->lb_len * 2);
if (buf->lb_buf == NULL)
RETURN(-ENOMEM);
/*
* we don't use lmm_buf directly, because we don't know xattr size, so
/*
* we don't use lmm_buf directly, because we don't know xattr size, so
- * by using mti_big_buf we can avoid calling mdo_xattr_get() twice.
+ * by using mdi_big_buf we can avoid calling mdo_xattr_get() twice.
*/
memcpy(lmm_buf->lb_buf, buf->lb_buf, rc);
*/
memcpy(lmm_buf->lb_buf, buf->lb_buf, rc);
struct lu_attr *snd_la = MDD_ENV_VAR(env, tattr);
struct mdd_device *mdd = mdo2mdd(obj1);
struct lov_mds_md *fst_lmm, *snd_lmm;
struct lu_attr *snd_la = MDD_ENV_VAR(env, tattr);
struct mdd_device *mdd = mdo2mdd(obj1);
struct lov_mds_md *fst_lmm, *snd_lmm;
- struct lu_buf *fst_buf = &info->mti_buf[0];
- struct lu_buf *snd_buf = &info->mti_buf[1];
- struct lu_buf *fst_hsm_buf = &info->mti_buf[2];
- struct lu_buf *snd_hsm_buf = &info->mti_buf[3];
+ struct lu_buf *fst_buf = &info->mdi_buf[0];
+ struct lu_buf *snd_buf = &info->mdi_buf[1];
+ struct lu_buf *fst_hsm_buf = &info->mdi_buf[2];
+ struct lu_buf *snd_hsm_buf = &info->mdi_buf[3];
struct ost_id *saved_oi = NULL;
struct thandle *handle;
struct mdd_object *dom_o = NULL;
struct ost_id *saved_oi = NULL;
struct thandle *handle;
struct mdd_object *dom_o = NULL;
- BUILD_BUG_ON(ARRAY_SIZE(info->mti_buf) < 4);
- memset(info->mti_buf, 0, sizeof(info->mti_buf));
+ BUILD_BUG_ON(ARRAY_SIZE(info->mdi_buf) < 4);
+ memset(info->mdi_buf, 0, sizeof(info->mdi_buf));
/* we have to sort the 2 obj, so locking will always
* be in the same order, even in case of 2 concurrent swaps */
/* we have to sort the 2 obj, so locking will always
* be in the same order, even in case of 2 concurrent swaps */
struct md_layout_change *mlc, struct thandle *handle)
{
struct mdd_device *mdd = mdd_obj2mdd_dev(obj);
struct md_layout_change *mlc, struct thandle *handle)
{
struct mdd_device *mdd = mdd_obj2mdd_dev(obj);
- struct lu_buf *som_buf = &mdd_env_info(env)->mti_buf[1];
+ struct lu_buf *som_buf = &mdd_env_info(env)->mdi_buf[1];
struct lustre_som_attrs *som = &mlc->mlc_som;
int fl = 0;
int rc;
struct lustre_som_attrs *som = &mlc->mlc_som;
int fl = 0;
int rc;
struct thandle *handle)
{
struct mdd_device *mdd = mdd_obj2mdd_dev(obj);
struct thandle *handle)
{
struct mdd_device *mdd = mdd_obj2mdd_dev(obj);
- struct lu_buf *som_buf = &mdd_env_info(env)->mti_buf[1];
+ struct lu_buf *som_buf = &mdd_env_info(env)->mdi_buf[1];
struct lustre_som_attrs *som = &mlc->mlc_som;
int fl = 0;
int rc;
struct lustre_som_attrs *som = &mlc->mlc_som;
int fl = 0;
int rc;
struct md_layout_change *mlc, struct thandle *handle)
{
struct mdd_device *mdd = mdd_obj2mdd_dev(obj);
struct md_layout_change *mlc, struct thandle *handle)
{
struct mdd_device *mdd = mdd_obj2mdd_dev(obj);
- struct lu_buf *som_buf = &mdd_env_info(env)->mti_buf[1];
+ struct lu_buf *som_buf = &mdd_env_info(env)->mdi_buf[1];
int fl = 0;
int rc;
ENTRY;
int fl = 0;
int rc;
ENTRY;
- lu_buf_check_and_alloc(&mdd_env_info(env)->mti_xattr_buf,
+ lu_buf_check_and_alloc(&mdd_env_info(env)->mdi_xattr_buf,
min_t(unsigned int,
mdd_obj2mdd_dev(o)->mdd_dt_conf.ddp_max_ea_size,
XATTR_SIZE_MAX));
min_t(unsigned int,
mdd_obj2mdd_dev(o)->mdd_dt_conf.ddp_max_ea_size,
XATTR_SIZE_MAX));
- buf = mdd_env_info(env)->mti_xattr_buf;
+ buf = mdd_env_info(env)->mdi_xattr_buf;
if (buf.lb_buf == NULL)
RETURN(-ENOMEM);
if (buf.lb_buf == NULL)
RETURN(-ENOMEM);
- lu_buf_check_and_alloc(&mdd_env_info(env)->mti_xattr_buf,
+ lu_buf_check_and_alloc(&mdd_env_info(env)->mdi_xattr_buf,
min_t(unsigned int,
mdd_obj2mdd_dev(obj)->mdd_dt_conf.ddp_max_ea_size,
XATTR_SIZE_MAX));
min_t(unsigned int,
mdd_obj2mdd_dev(obj)->mdd_dt_conf.ddp_max_ea_size,
XATTR_SIZE_MAX));
- buf = mdd_env_info(env)->mti_xattr_buf;
+ buf = mdd_env_info(env)->mdi_xattr_buf;
if (buf.lb_buf == NULL)
RETURN(-ENOMEM);
if (buf.lb_buf == NULL)
RETURN(-ENOMEM);