struct dt_object_format *dof,
struct thandle *th)
{
- struct lod_object *lo = lod_dt_obj(dt);
- struct lmv_user_md_v1 *lum = lum_buf->lb_buf;
- int rc;
- ENTRY;
+ struct lod_object *lo = lod_dt_obj(dt);
+ struct lmv_user_md_v1 *lum = lum_buf->lb_buf;
+ int rc;
+ ENTRY;
LASSERT(lum != NULL);
- CDEBUG(D_INFO, "lum magic = %x count = %u offset = %d\n",
- le32_to_cpu(lum->lum_magic), le32_to_cpu(lum->lum_stripe_count),
- (int)le32_to_cpu(lum->lum_stripe_offset));
+ CDEBUG(D_INFO,
+ "lum magic=%x hash=%x count=%u offset=%d inherit=%u rr=%u\n",
+ le32_to_cpu(lum->lum_magic), le32_to_cpu(lum->lum_hash_type),
+ le32_to_cpu(lum->lum_stripe_count),
+ (int)le32_to_cpu(lum->lum_stripe_offset),
+ lum->lum_max_inherit, lum->lum_max_inherit_rr);
if (lo->ldo_dir_stripe_count == 0) {
if (lo->ldo_is_foreign) {
*
* \param[in] env execution environment
* \param[in] dt target object
- * \param[in] buf LMV buf which contains source stripe fids
+ * \param[in] lmv_buf LMV buf which contains source stripe FIDs
* \param[in] fl set or replace
* \param[in] th transaction handle
*
*/
static int lod_dir_layout_set(const struct lu_env *env,
struct dt_object *dt,
- const struct lu_buf *buf,
+ const struct lu_buf *lmv_buf,
int fl,
struct thandle *th)
{
struct dt_object *next = dt_object_child(dt);
struct lod_object *lo = lod_dt_obj(dt);
struct lod_device *lod = lu2lod_dev(lod2lu_obj(lo)->lo_dev);
- struct lmv_mds_md_v1 *lmv = buf->lb_buf;
+ struct lmv_mds_md_v1 *lmv = lmv_buf->lb_buf;
struct lmv_mds_md_v1 *slave_lmv;
struct lu_buf slave_buf;
int i;
LMV_DEBUG(D_INFO, lmv, "set");
- rc = lod_sub_xattr_set(env, next, buf, XATTR_NAME_LMV, fl, th);
+ rc = lod_sub_xattr_set(env, next, lmv_buf, XATTR_NAME_LMV, fl, th);
if (rc)
RETURN(rc);
static int lod_get_default_lov_striping(const struct lu_env *env,
struct lod_object *lo,
struct lod_default_striping *lds,
- struct dt_allocation_hint *ah)
+ struct dt_allocation_hint *dah)
{
struct lod_thread_info *info = lod_env_info(env);
struct lov_user_md_v1 *v1 = NULL;
struct lov_user_md_v3 *v3 = NULL;
- struct lov_comp_md_v1 *comp_v1 = NULL;
- __u16 comp_cnt;
- __u16 mirror_cnt;
- bool composite;
+ struct lov_comp_md_v1 *lcm = NULL;
+ __u32 magic;
+ int append_stripe_count = dah != NULL ? dah->dah_append_stripe_count : 0;
+ const char *append_pool = (dah != NULL &&
+ dah->dah_append_pool != NULL &&
+ dah->dah_append_pool[0] != '\0') ?
+ dah->dah_append_pool : NULL;
+ __u16 entry_count = 1;
+ __u16 mirror_count = 0;
+ bool want_composite = false;
int rc, i, j;
ENTRY;
if (rc < (typeof(rc))sizeof(struct lov_user_md))
RETURN(0);
- v1 = info->lti_ea_store;
- if (v1->lmm_magic == __swab32(LOV_USER_MAGIC_V1)) {
- lustre_swab_lov_user_md_v1(v1);
- } else if (v1->lmm_magic == __swab32(LOV_USER_MAGIC_V3)) {
- v3 = (struct lov_user_md_v3 *)v1;
- lustre_swab_lov_user_md_v3(v3);
- } else if (v1->lmm_magic == __swab32(LOV_USER_MAGIC_SPECIFIC)) {
- v3 = (struct lov_user_md_v3 *)v1;
+ magic = *(__u32 *)info->lti_ea_store;
+ if (magic == __swab32(LOV_USER_MAGIC_V1)) {
+ lustre_swab_lov_user_md_v1(info->lti_ea_store);
+ } else if (magic == __swab32(LOV_USER_MAGIC_V3)) {
+ lustre_swab_lov_user_md_v3(info->lti_ea_store);
+ } else if (magic == __swab32(LOV_USER_MAGIC_SPECIFIC)) {
+ v3 = (struct lov_user_md_v3 *)info->lti_ea_store;
lustre_swab_lov_user_md_v3(v3);
lustre_swab_lov_user_md_objects(v3->lmm_objects,
v3->lmm_stripe_count);
- } else if (v1->lmm_magic == __swab32(LOV_USER_MAGIC_COMP_V1) ||
- v1->lmm_magic == __swab32(LOV_USER_MAGIC_SEL)) {
- comp_v1 = (struct lov_comp_md_v1 *)v1;
- lustre_swab_lov_comp_md_v1(comp_v1);
+ } else if (magic == __swab32(LOV_USER_MAGIC_COMP_V1) ||
+ magic == __swab32(LOV_USER_MAGIC_SEL)) {
+ lustre_swab_lov_comp_md_v1(info->lti_ea_store);
}
- if (v1->lmm_magic != LOV_MAGIC_V3 && v1->lmm_magic != LOV_MAGIC_V1 &&
- v1->lmm_magic != LOV_MAGIC_COMP_V1 &&
- v1->lmm_magic != LOV_MAGIC_SEL &&
- v1->lmm_magic != LOV_USER_MAGIC_SPECIFIC)
+ switch (magic) {
+ case LOV_MAGIC_V1:
+ case LOV_MAGIC_V3:
+ case LOV_USER_MAGIC_SPECIFIC:
+ v1 = info->lti_ea_store;
+ break;
+ case LOV_MAGIC_COMP_V1:
+ case LOV_MAGIC_SEL:
+ lcm = info->lti_ea_store;
+ entry_count = lcm->lcm_entry_count;
+ if (entry_count == 0)
+ RETURN(-EINVAL);
+
+ mirror_count = lcm->lcm_mirror_count + 1;
+ want_composite = true;
+ break;
+ default:
RETURN(-ENOTSUPP);
+ }
- if ((v1->lmm_magic == LOV_MAGIC_COMP_V1 ||
- v1->lmm_magic == LOV_MAGIC_SEL) &&
- !(ah && ah->dah_append_stripes)) {
- comp_v1 = (struct lov_comp_md_v1 *)v1;
- comp_cnt = comp_v1->lcm_entry_count;
- if (comp_cnt == 0)
- RETURN(-EINVAL);
- mirror_cnt = comp_v1->lcm_mirror_count + 1;
- composite = true;
- } else {
- comp_cnt = 1;
- mirror_cnt = 0;
- composite = false;
+ if (append_stripe_count != 0 || append_pool != NULL) {
+ entry_count = 1;
+ mirror_count = 0;
+ want_composite = false;
}
/* realloc default comp entries if necessary */
- rc = lod_def_striping_comp_resize(lds, comp_cnt);
+ rc = lod_def_striping_comp_resize(lds, entry_count);
if (rc < 0)
RETURN(rc);
- lds->lds_def_comp_cnt = comp_cnt;
- lds->lds_def_striping_is_composite = composite;
- lds->lds_def_mirror_cnt = mirror_cnt;
+ lds->lds_def_comp_cnt = entry_count;
+ lds->lds_def_striping_is_composite = want_composite;
+ lds->lds_def_mirror_cnt = mirror_count;
- for (i = 0; i < comp_cnt; i++) {
- struct lod_layout_component *lod_comp;
- char *pool;
+ for (i = 0; i < entry_count; i++) {
+ struct lod_layout_component *llc = &lds->lds_def_comp_entries[i];
+ const char *pool;
- lod_comp = &lds->lds_def_comp_entries[i];
/*
- * reset lod_comp values, llc_stripes is always NULL in
- * the default striping template, llc_pool will be reset
- * later below.
+ * reset llc values, llc_stripes is always NULL in the
+ * default striping template, llc_pool will be reset
+ * later below using lod_set_pool().
+ *
+ * XXX At this point llc_pool may point to valid (!)
+ * kmalloced strings from previous RPCs.
*/
- memset(lod_comp, 0, offsetof(typeof(*lod_comp), llc_pool));
-
- if (composite) {
- v1 = (struct lov_user_md *)((char *)comp_v1 +
- comp_v1->lcm_entries[i].lcme_offset);
- lod_comp->llc_extent =
- comp_v1->lcm_entries[i].lcme_extent;
- /* We only inherit certain flags from the layout */
- lod_comp->llc_flags =
- comp_v1->lcm_entries[i].lcme_flags &
+ memset(llc, 0, offsetof(typeof(*llc), llc_pool));
+
+ if (lcm != NULL) {
+ v1 = (struct lov_user_md *)((char *)lcm +
+ lcm->lcm_entries[i].lcme_offset);
+
+ if (want_composite) {
+ llc->llc_extent = lcm->lcm_entries[i].lcme_extent;
+ /* We only inherit certain flags from the layout */
+ llc->llc_flags = lcm->lcm_entries[i].lcme_flags &
LCME_TEMPLATE_FLAGS;
+ }
}
+ CDEBUG(D_LAYOUT, DFID" magic = %#08x, pattern = %#x, stripe_count = %hu, stripe_size = %u, stripe_offset = %hu, append_pool = '%s', append_stripe_count = %d\n",
+ PFID(lu_object_fid(&lo->ldo_obj.do_lu)),
+ v1->lmm_magic,
+ v1->lmm_pattern,
+ v1->lmm_stripe_count,
+ v1->lmm_stripe_size,
+ v1->lmm_stripe_offset,
+ append_pool ?: "",
+ append_stripe_count);
+
if (!lov_pattern_supported(v1->lmm_pattern) &&
!(v1->lmm_pattern & LOV_PATTERN_F_RELEASED)) {
lod_free_def_comp_entries(lds);
RETURN(-EINVAL);
}
- CDEBUG(D_LAYOUT, DFID" stripe_count=%d stripe_size=%d stripe_offset=%d append_stripes=%d\n",
- PFID(lu_object_fid(&lo->ldo_obj.do_lu)),
- (int)v1->lmm_stripe_count, (int)v1->lmm_stripe_size,
- (int)v1->lmm_stripe_offset,
- ah ? ah->dah_append_stripes : 0);
+ llc->llc_stripe_count = v1->lmm_stripe_count;
+ llc->llc_stripe_size = v1->lmm_stripe_size;
+ llc->llc_stripe_offset = v1->lmm_stripe_offset;
+ llc->llc_pattern = v1->lmm_pattern;
- if (ah && ah->dah_append_stripes)
- lod_comp->llc_stripe_count = ah->dah_append_stripes;
- else
- lod_comp->llc_stripe_count = v1->lmm_stripe_count;
- lod_comp->llc_stripe_size = v1->lmm_stripe_size;
- lod_comp->llc_stripe_offset = v1->lmm_stripe_offset;
- lod_comp->llc_pattern = v1->lmm_pattern;
+ if (append_stripe_count != 0 || append_pool != NULL)
+ llc->llc_pattern = LOV_PATTERN_RAID0;
+
+ if (append_stripe_count != 0)
+ llc->llc_stripe_count = append_stripe_count;
pool = NULL;
- if (ah && ah->dah_append_pool && ah->dah_append_pool[0]) {
- pool = ah->dah_append_pool;
+ if (append_pool != NULL) {
+ pool = append_pool;
} else if (v1->lmm_magic == LOV_USER_MAGIC_V3) {
/* XXX: sanity check here */
- v3 = (struct lov_user_md_v3 *) v1;
+ v3 = (struct lov_user_md_v3 *)v1;
if (v3->lmm_pool_name[0] != '\0')
pool = v3->lmm_pool_name;
}
- lod_set_def_pool(lds, i, pool);
- if (v1->lmm_magic == LOV_USER_MAGIC_SPECIFIC) {
+
+ lod_set_pool(&llc->llc_pool, pool);
+
+ if (append_stripe_count != 0 || append_pool != NULL) {
+ /* Ignore specific striping for append. */
+ } else if (v1->lmm_magic == LOV_USER_MAGIC_SPECIFIC) {
v3 = (struct lov_user_md_v3 *)v1;
- rc = lod_comp_copy_ost_lists(lod_comp, v3);
+ rc = lod_comp_copy_ost_lists(llc, v3);
if (rc)
RETURN(rc);
- } else if (lod_comp->llc_ostlist.op_array &&
- lod_comp->llc_ostlist.op_count) {
- for (j = 0; j < lod_comp->llc_ostlist.op_count; j++)
- lod_comp->llc_ostlist.op_array[j] = -1;
- lod_comp->llc_ostlist.op_count = 0;
+ } else if (llc->llc_ostlist.op_array &&
+ llc->llc_ostlist.op_count) {
+ for (j = 0; j < llc->llc_ostlist.op_count; j++)
+ llc->llc_ostlist.op_array[j] = -1;
+ llc->llc_ostlist.op_count = 0;
}
}
struct lod_layout_component *def_comp =
&lds->lds_def_comp_entries[i];
- CDEBUG(D_LAYOUT, "Inherit from default: flags=%#x "
- "size=%hu nr=%u offset=%u pattern=%#x pool=%s\n",
+ CDEBUG(D_LAYOUT,
+ "inherit "DFID" file layout from default: flags=%#x size=%hu nr=%u offset=%u pattern=%#x pool=%s\n",
+ PFID(lu_object_fid(&lo->ldo_obj.do_lu)),
def_comp->llc_flags,
def_comp->llc_stripe_size,
def_comp->llc_stripe_count,
if (lo->ldo_dir_stripe_offset == -1)
lo->ldo_dir_stripe_offset =
lds->lds_dir_def_stripe_offset;
- if (lo->ldo_dir_hash_type == 0)
+ if (lo->ldo_dir_hash_type == LMV_HASH_TYPE_UNKNOWN)
lo->ldo_dir_hash_type = lds->lds_dir_def_hash_type;
- CDEBUG(D_LAYOUT, "striping from default dir: count:%hu, "
- "offset:%u, hash_type:%u\n",
+ CDEBUG(D_LAYOUT,
+ "inherit "DFID" dir layout from default: count=%hu offset=%u hash_type=%x\n",
+ PFID(lu_object_fid(&lo->ldo_obj.do_lu)),
lo->ldo_dir_stripe_count, lo->ldo_dir_stripe_offset,
lo->ldo_dir_hash_type);
}
}
static inline bool lod_need_inherit_more(struct lod_object *lo, bool from_root,
- char *append_pool)
+ const char *append_pool)
{
struct lod_layout_component *lod_comp;
* This method is used to make a decision on the striping configuration for the
* object being created. It can be taken from the \a parent object if it exists,
* or filesystem's default. The resulting configuration (number of stripes,
- * stripe size/offset, pool name, etc) is stored in the object itself and will
- * be used by the methods like ->doo_declare_create().
+ * stripe size/offset, pool name, hash_type, etc.) is stored in the object
+ * itself and will be used by the methods like ->doo_declare_create().
*
* \see dt_object_operations::do_ah_init() in the API description for details.
*/
LASSERT(child);
- if (ah->dah_append_stripes == -1)
- ah->dah_append_stripes =
+ if (ah->dah_append_stripe_count == -1)
+ ah->dah_append_stripe_count =
d->lod_ost_descs.ltd_lov_desc.ld_tgt_count;
if (likely(parent)) {
lc->ldo_dir_hash_type =
le32_to_cpu(lum1->lum_hash_type);
CDEBUG(D_INFO,
- "set dirstripe: count %hu, offset %d, hash %u\n",
+ "set dirstripe: count %hu, offset %d, hash %x\n",
lc->ldo_dir_stripe_count,
(int)lc->ldo_dir_stripe_offset,
lc->ldo_dir_hash_type);
lc->ldo_dir_stripe_count = 0;
}
- if (!(lc->ldo_dir_hash_type & LMV_HASH_TYPE_MASK))
- lc->ldo_dir_hash_type |=
+ if (!lmv_is_known_hash_type(lc->ldo_dir_hash_type))
+ lc->ldo_dir_hash_type =
+ (lc->ldo_dir_hash_type & LMV_HASH_FLAG_KNOWN) |
d->lod_mdt_descs.ltd_lmv_desc.ld_pattern;
- CDEBUG(D_INFO, "final dir stripe [%hu %d %u]\n",
+ CDEBUG(D_INFO, "final dir stripe_count=%hu offset=%d hash=%u\n",
lc->ldo_dir_stripe_count,
(int)lc->ldo_dir_stripe_offset, lc->ldo_dir_hash_type);
LASSERT(!lc->ldo_is_composite);
lod_comp = &lc->ldo_comp_entries[0];
desc = &d->lod_ost_descs.ltd_lov_desc;
- lod_adjust_stripe_info(lod_comp, desc, ah->dah_append_stripes);
+ lod_adjust_stripe_info(lod_comp, desc,
+ ah->dah_append_stripe_count);
if (ah->dah_append_pool && ah->dah_append_pool[0])
lod_obj_set_pool(lc, 0, ah->dah_append_pool);
}
lo->ldo_dir_stripes_allocated = 0;
lo->ldo_dir_stripe_loaded = 0;
lo->ldo_dir_stripe_count = 0;
+ lo->ldo_obj.do_index_ops = NULL;
} else if (lo->ldo_comp_entries != NULL) {
for (i = 0; i < lo->ldo_comp_cnt; i++) {
/* free lod_layout_component::llc_stripe array */
git://git.whamcloud.com / fs / lustre-release.git / blobdiff