LASSERT(next->do_ops);
LASSERT(next->do_ops->do_index_try);
- rc = lod_load_striping_locked(env, lo);
+ rc = lod_striping_load(env, lo);
if (rc != 0)
RETURN(rc);
data->locd_comp_skip_cb(env, lo, i, data))
continue;
+ if (data->locd_comp_cb) {
+ rc = data->locd_comp_cb(env, lo, i, data);
+ if (rc)
+ RETURN(rc);
+ }
+
+ /* could used just to do sth about component, not each
+ * stripes
+ */
+ if (!data->locd_stripe_cb)
+ continue;
+
LASSERT(lod_comp->llc_stripe_count > 0);
for (j = 0; j < lod_comp->llc_stripe_count; j++) {
struct dt_object *dt = lod_comp->llc_stripe[j];
* is being initialized as we don't need this information till
* few specific cases like destroy, chown
*/
- rc = lod_load_striping(env, lo);
+ rc = lod_striping_load(env, lo);
if (rc)
RETURN(rc);
* the in-memory striping information has been freed in lod_xattr_set()
* due to layout change. It has to load stripe here again. It only
* changes flags of layout so declare_attr_set() is still accurate */
- rc = lod_load_striping_locked(env, lo);
+ rc = lod_striping_load(env, lo);
if (rc)
RETURN(rc);
int rc = 0;
ENTRY;
+ LASSERT(mutex_is_locked(&lo->ldo_layout_mutex));
+
if (le32_to_cpu(lmv1->lmv_hash_type) & LMV_HASH_FLAG_MIGRATION)
RETURN(0);
lo->ldo_dir_stripe_count = le32_to_cpu(lmv1->lmv_stripe_count);
lo->ldo_dir_stripes_allocated = le32_to_cpu(lmv1->lmv_stripe_count);
if (rc != 0)
- lod_object_free_striping(env, lo);
+ lod_striping_free_nolock(env, lo);
RETURN(rc);
}
idx, i, PFID(&fid));
idx_array[i] = idx;
/* Set the start index for next stripe allocation */
- if (!is_specific && i < stripe_count - 1)
+ if (!is_specific && i < stripe_count - 1) {
+ /*
+ * for large dir test, put all other slaves on one
+ * remote MDT, otherwise we may save too many local
+ * slave locks which will exceed RS_MAX_LOCKS.
+ */
+ if (unlikely(OBD_FAIL_CHECK(OBD_FAIL_LARGE_STRIPE)))
+ idx = master_index;
idx_array[i + 1] = (idx + 1) %
(lod->lod_remote_mdt_count + 1);
+ }
/* tgt_dt and fid must be ready after search avaible OSP
* in the above loop */
LASSERT(tgt_dt != NULL);
stripe[i] = dto;
}
- lo->ldo_dir_stripe_loaded = 1;
lo->ldo_dir_striped = 1;
lo->ldo_stripe = stripe;
lo->ldo_dir_stripe_count = i;
lo->ldo_dir_stripes_allocated = stripe_count;
+ smp_mb();
+ lo->ldo_dir_stripe_loaded = 1;
if (lo->ldo_dir_stripe_count == 0)
GOTO(out_put, rc = -ENOSPC);
if (rc != 0) {
/* failed to create striping, let's reset
* config so that others don't get confused */
- lod_object_free_striping(env, lo);
+ lod_striping_free(env, lo);
GOTO(out, rc);
}
out:
RETURN(0);
/* set xattr to each stripes, if needed */
- rc = lod_load_striping(env, lo);
+ rc = lod_striping_load(env, lo);
if (rc != 0)
RETURN(rc);
LASSERT(S_ISREG(dt->do_lu.lo_header->loh_attr));
/* set xattr to each stripes, if needed */
- rc = lod_load_striping(env, lo);
+ rc = lod_striping_load(env, lo);
if (rc != 0)
RETURN(rc);
if (flags & LCME_FL_INIT) {
if (changed)
- lod_object_free_striping(env, lo);
+ lod_striping_free(env, lo);
RETURN(-EINVAL);
}
{
struct lod_device *d = lu2lod_dev(dt->do_lu.lo_dev);
struct lod_object *lo = lod_dt_obj(dt);
- struct dt_object *next = dt_object_child(&lo->ldo_obj);
char *op;
int rc, len = strlen(XATTR_LUSTRE_LOV);
ENTRY;
}
len++;
- dt_write_lock(env, next, 0);
- rc = lod_load_striping_locked(env, lo);
+ rc = lod_striping_load(env, lo);
if (rc)
GOTO(unlock, rc);
}
unlock:
if (rc)
- lod_object_free_striping(env, lo);
- dt_write_unlock(env, next);
+ lod_striping_free(env, lo);
RETURN(rc);
}
if ((le16_to_cpu(lcm->lcm_flags) & LCM_FL_FLR_MASK) == LCM_FL_NONE)
lcm->lcm_flags = cpu_to_le32(LCM_FL_RDONLY);
- LASSERT(dt_write_locked(env, dt_object_child(dt)));
- lod_object_free_striping(env, lo);
- rc = lod_parse_striping(env, lo, buf);
+ rc = lod_striping_reload(env, lo, buf);
if (rc)
GOTO(out, rc);
lod_obj_inc_layout_gen(lo);
lcm->lcm_layout_gen = cpu_to_le32(lo->ldo_layout_gen);
- lod_object_free_striping(env, lo);
- rc = lod_parse_striping(env, lo, mbuf);
+ rc = lod_striping_reload(env, lo, mbuf);
if (rc)
RETURN(rc);
lum = buf->lb_buf;
switch (lum->lmm_magic) {
+ case LOV_USER_MAGIC_SPECIFIC:
case LOV_USER_MAGIC_V3:
v3 = buf->lb_buf;
if (v3->lmm_pool_name[0] != '\0')
LASSERT(lo);
if (lo->ldo_comp_cnt == 0) {
- lod_object_free_striping(env, lo);
+ lod_striping_free(env, lo);
rc = lod_sub_xattr_del(env, next, XATTR_NAME_LOV, th);
RETURN(rc);
}
OBD_FREE(lod_comp->llc_stripe, sizeof(struct dt_object *) *
lod_comp->llc_stripes_allocated);
lod_comp->llc_stripe = NULL;
+ OBD_FREE(lod_comp->llc_ost_indices,
+ sizeof(__u32) * lod_comp->llc_stripes_allocated);
+ lod_comp->llc_ost_indices = NULL;
lod_comp->llc_stripes_allocated = 0;
lod_obj_set_pool(lo, i, NULL);
if (lod_comp->llc_ostlist.op_array) {
EXIT;
out:
if (rc)
- lod_object_free_striping(env, lo);
+ lod_striping_free(env, lo);
return rc;
}
* defines striping, then create() does the work */
if (fl & LU_XATTR_REPLACE) {
/* free stripes, then update disk */
- lod_object_free_striping(env, lod_dt_obj(dt));
+ lod_striping_free(env, lod_dt_obj(dt));
rc = lod_sub_xattr_set(env, next, buf, name, fl, th);
} else if (dt_object_remote(dt)) {
RETURN(0);
/* set xattr to each stripes, if needed */
- rc = lod_load_striping(env, lo);
+ rc = lod_striping_load(env, lo);
if (rc != 0)
RETURN(rc);
ENTRY;
if (!strcmp(name, XATTR_NAME_LOV))
- lod_object_free_striping(env, lod_dt_obj(dt));
+ lod_striping_free(env, lod_dt_obj(dt));
rc = lod_sub_xattr_del(env, next, name, th);
if (rc != 0 || !S_ISDIR(dt->do_lu.lo_header->loh_attr))
return (is_reg && fid_seq(fid) != FID_SEQ_LOCAL_FILE);
}
+/**
+ * Copy OST list from layout provided by user.
+ *
+ * \param[in] lod_comp layout_component to be filled
+ * \param[in] v3 LOV EA V3 user data
+ *
+ * \retval 0 on success
+ * \retval negative if failed
+ */
+int lod_comp_copy_ost_lists(struct lod_layout_component *lod_comp,
+ struct lov_user_md_v3 *v3)
+{
+ int j;
+
+ ENTRY;
+
+ if (v3->lmm_stripe_offset == LOV_OFFSET_DEFAULT)
+ v3->lmm_stripe_offset = v3->lmm_objects[0].l_ost_idx;
+
+ if (lod_comp->llc_ostlist.op_array) {
+ if (lod_comp->llc_ostlist.op_count ==
+ v3->lmm_stripe_count)
+ goto skip;
+ OBD_FREE(lod_comp->llc_ostlist.op_array,
+ lod_comp->llc_ostlist.op_size);
+ }
+
+ /* copy ost list from lmm */
+ lod_comp->llc_ostlist.op_count = v3->lmm_stripe_count;
+ lod_comp->llc_ostlist.op_size = v3->lmm_stripe_count * sizeof(__u32);
+ OBD_ALLOC(lod_comp->llc_ostlist.op_array,
+ lod_comp->llc_ostlist.op_size);
+ if (!lod_comp->llc_ostlist.op_array)
+ RETURN(-ENOMEM);
+skip:
+ for (j = 0; j < v3->lmm_stripe_count; j++) {
+ lod_comp->llc_ostlist.op_array[j] =
+ v3->lmm_objects[j].l_ost_idx;
+ }
+
+ RETURN(0);
+}
+
/**
* Get default striping.
} 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;
+ 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)) {
comp_v1 = (struct lov_comp_md_v1 *)v1;
lustre_swab_lov_comp_md_v1(comp_v1);
}
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_COMP_V1 &&
+ v1->lmm_magic != LOV_USER_MAGIC_SPECIFIC)
RETURN(-ENOTSUPP);
if (v1->lmm_magic == LOV_MAGIC_COMP_V1) {
pool = v3->lmm_pool_name;
}
lod_set_def_pool(lds, i, pool);
+ if (v1->lmm_magic == LOV_USER_MAGIC_SPECIFIC) {
+ v3 = (struct lov_user_md_v3 *)v1;
+ rc = lod_comp_copy_ost_lists(lod_comp, v3);
+ if (rc)
+ RETURN(rc);
+ }
}
lds->lds_def_striping_set = 1;
lod_obj_set_pool(lo, i, def_comp->llc_pool);
}
+ /* copy ost list */
+ if (def_comp->llc_ostlist.op_array) {
+ OBD_ALLOC(obj_comp->llc_ostlist.op_array,
+ obj_comp->llc_ostlist.op_size);
+ if (!obj_comp->llc_ostlist.op_array)
+ return;
+ memcpy(obj_comp->llc_ostlist.op_array,
+ def_comp->llc_ostlist.op_array,
+ obj_comp->llc_ostlist.op_size);
+ }
+
/*
* Don't initialize these fields for plain layout
* (v1/v3) here, they are inherited in the order of
/* failed to create striping or to set initial size, let's reset
* config so that others don't get confused */
if (rc)
- lod_object_free_striping(env, lo);
+ lod_striping_free(env, lo);
RETURN(rc);
}
/* failed to create striping or to set initial size, let's reset
* config so that others don't get confused */
if (rc)
- lod_object_free_striping(env, lo);
+ lod_striping_free(env, lo);
RETURN(rc);
}
RETURN(0);
out:
- lod_object_free_striping(env, lo);
+ lod_striping_free(env, lo);
RETURN(rc);
}
* is being initialized as we don't need this information till
* few specific cases like destroy, chown
*/
- rc = lod_load_striping(env, lo);
+ rc = lod_striping_load(env, lo);
if (rc)
RETURN(rc);
}
/**
- * Release LDLM locks on the stripes of a striped directory.
- *
- * Iterates over all the locks taken on the stripe objects and
- * cancel them.
- *
- * \param[in] env execution environment
- * \param[in] dt striped object
- * \param[in] einfo lock description
- * \param[in] policy data describing requested lock
- *
- * \retval 0 on success
- * \retval negative if failed
- */
-static int lod_object_unlock_internal(const struct lu_env *env,
- struct dt_object *dt,
- struct ldlm_enqueue_info *einfo,
- union ldlm_policy_data *policy)
-{
- struct lustre_handle_array *slave_locks = einfo->ei_cbdata;
- int rc = 0;
- int i;
- ENTRY;
-
- if (slave_locks == NULL)
- RETURN(0);
-
- for (i = 1; i < slave_locks->count; i++) {
- if (lustre_handle_is_used(&slave_locks->handles[i]))
- ldlm_lock_decref_and_cancel(&slave_locks->handles[i],
- einfo->ei_mode);
- }
-
- RETURN(rc);
-}
-
-/**
* Implementation of dt_object_operations::do_object_unlock.
*
* Used to release LDLM lock(s).
LASSERT(!dt_object_remote(dt_object_child(dt)));
/* locks were unlocked in MDT layer */
- for (i = 1; i < slave_locks->count; i++) {
- LASSERT(!lustre_handle_is_used(&slave_locks->handles[i]));
+ for (i = 0; i < slave_locks->ha_count; i++)
+ LASSERT(!lustre_handle_is_used(&slave_locks->ha_handles[i]));
+
+ /*
+ * NB, ha_count may not equal to ldo_dir_stripe_count, because dir
+ * layout may change, e.g., shrink dir layout after migration.
+ */
+ for (i = 0; i < lo->ldo_dir_stripe_count; i++)
dt_invalidate(env, lo->ldo_stripe[i]);
- }
- slave_locks_size = sizeof(*slave_locks) + slave_locks->count *
- sizeof(slave_locks->handles[0]);
+ slave_locks_size = offsetof(typeof(*slave_locks),
+ ha_handles[slave_locks->ha_count]);
OBD_FREE(slave_locks, slave_locks_size);
einfo->ei_cbdata = NULL;
struct ldlm_enqueue_info *einfo,
union ldlm_policy_data *policy)
{
- struct lod_object *lo = lod_dt_obj(dt);
- int rc = 0;
- int i;
- int slave_locks_size;
+ struct lod_object *lo = lod_dt_obj(dt);
+ int slave_locks_size;
struct lustre_handle_array *slave_locks = NULL;
+ int i;
+ int rc;
ENTRY;
/* remote object lock */
}
if (!S_ISDIR(dt->do_lu.lo_header->loh_attr))
- GOTO(out, rc = -ENOTDIR);
+ RETURN(-ENOTDIR);
- rc = lod_load_striping(env, lo);
+ rc = lod_striping_load(env, lo);
if (rc != 0)
- GOTO(out, rc);
+ RETURN(rc);
/* No stripes */
- if (lo->ldo_dir_stripe_count <= 1) {
- /*
- * NB, ei_cbdata stores pointer to slave locks, if no locks
- * taken, make sure it's set to NULL, otherwise MDT will try to
- * unlock them.
- */
- einfo->ei_cbdata = NULL;
- GOTO(out, rc = 0);
- }
+ if (lo->ldo_dir_stripe_count <= 1)
+ RETURN(0);
- slave_locks_size = sizeof(*slave_locks) + lo->ldo_dir_stripe_count *
- sizeof(slave_locks->handles[0]);
+ slave_locks_size = offsetof(typeof(*slave_locks),
+ ha_handles[lo->ldo_dir_stripe_count]);
/* Freed in lod_object_unlock */
OBD_ALLOC(slave_locks, slave_locks_size);
- if (slave_locks == NULL)
- GOTO(out, rc = -ENOMEM);
- slave_locks->count = lo->ldo_dir_stripe_count;
+ if (!slave_locks)
+ RETURN(-ENOMEM);
+ slave_locks->ha_count = lo->ldo_dir_stripe_count;
/* striped directory lock */
- for (i = 1; i < lo->ldo_dir_stripe_count; i++) {
- struct lustre_handle lockh;
- struct ldlm_res_id *res_id;
+ for (i = 0; i < lo->ldo_dir_stripe_count; i++) {
+ struct lustre_handle lockh;
+ struct ldlm_res_id *res_id;
res_id = &lod_env_info(env)->lti_res_id;
fid_build_reg_res_name(lu_object_fid(&lo->ldo_stripe[i]->do_lu),
einfo->ei_res_id = res_id;
LASSERT(lo->ldo_stripe[i] != NULL);
- if (likely(dt_object_remote(lo->ldo_stripe[i]))) {
+ if (dt_object_remote(lo->ldo_stripe[i])) {
+ set_bit(i, (void *)slave_locks->ha_map);
rc = dt_object_lock(env, lo->ldo_stripe[i], &lockh,
einfo, policy);
} else {
struct ldlm_namespace *ns = einfo->ei_namespace;
ldlm_blocking_callback blocking = einfo->ei_cb_local_bl;
ldlm_completion_callback completion = einfo->ei_cb_cp;
- __u64 dlmflags = LDLM_FL_ATOMIC_CB;
+ __u64 dlmflags = LDLM_FL_ATOMIC_CB;
if (einfo->ei_mode == LCK_PW ||
einfo->ei_mode == LCK_EX)
dlmflags |= LDLM_FL_COS_INCOMPAT;
- /* This only happens if there are mulitple stripes
- * on the master MDT, i.e. except stripe0, there are
- * other stripes on the Master MDT as well, Only
- * happens in the test case right now. */
LASSERT(ns != NULL);
rc = ldlm_cli_enqueue_local(ns, res_id, LDLM_IBITS,
policy, einfo->ei_mode,
NULL, 0, LVB_T_NONE,
NULL, &lockh);
}
- if (rc != 0)
- break;
- slave_locks->handles[i] = lockh;
+ if (rc) {
+ while (i--)
+ ldlm_lock_decref_and_cancel(
+ &slave_locks->ha_handles[i],
+ einfo->ei_mode);
+ OBD_FREE(slave_locks, slave_locks_size);
+ RETURN(rc);
+ }
+ slave_locks->ha_handles[i] = lockh;
}
einfo->ei_cbdata = slave_locks;
- if (rc != 0 && slave_locks != NULL) {
- lod_object_unlock_internal(env, dt, einfo, policy);
- OBD_FREE(slave_locks, slave_locks_size);
- }
- EXIT;
-out:
- if (rc != 0)
- einfo->ei_cbdata = NULL;
- RETURN(rc);
+ RETURN(0);
}
/**
struct lod_object *lo, struct thandle *th)
{
struct lod_thread_info *info = lod_env_info(env);
- struct ost_pool *inuse = &info->lti_inuse_osts;
int i;
int rc = 0;
ENTRY;
LASSERT(info->lti_count < lo->ldo_comp_cnt);
- if (info->lti_count > 0) {
- /* Prepare inuse array for composite file */
- rc = lod_prepare_inuse(env, lo);
- if (rc)
- RETURN(rc);
- }
for (i = 0; i < info->lti_count; i++) {
rc = lod_qos_prep_create(env, lo, NULL, th,
- info->lti_comp_idx[i], inuse);
+ info->lti_comp_idx[i]);
if (rc)
break;
}
GOTO(out, rc = -EINVAL);
}
- lod_object_free_striping(env, lo);
rc = lod_use_defined_striping(env, lo, buf);
if (rc)
GOTO(out, rc);
replay = true;
} else {
/* non replay path */
- rc = lod_load_striping_locked(env, lo);
+ rc = lod_striping_load(env, lo);
if (rc)
GOTO(out, rc);
}
rc = lod_declare_instantiate_components(env, lo, th);
out:
if (rc)
- lod_object_free_striping(env, lo);
+ lod_striping_free(env, lo);
RETURN(rc);
}
-#define lod_foreach_mirror_comp(comp, lo, mirror_idx) \
-for (comp = &lo->ldo_comp_entries[lo->ldo_mirrors[mirror_idx].lme_start]; \
- comp <= &lo->ldo_comp_entries[lo->ldo_mirrors[mirror_idx].lme_end]; \
- comp++)
-
static inline int lod_comp_index(struct lod_object *lo,
struct lod_layout_component *lod_comp)
{
ost = OST_TGT(lod, idx);
if (ost->ltd_statfs.os_state &
- (OS_STATE_READONLY | OS_STATE_ENOSPC | OS_STATE_ENOINO) ||
+ (OS_STATE_READONLY | OS_STATE_ENOSPC | OS_STATE_ENOINO |
+ OS_STATE_NOPRECREATE) ||
ost->ltd_active == 0) {
CDEBUG(D_LAYOUT, DFID ": mirror %d OST%d unavail, rc = %d\n",
PFID(lod_object_fid(lo)), index, idx, rc);
out:
if (rc)
- lod_object_free_striping(env, lo);
+ lod_striping_free(env, lo);
RETURN(rc);
}
lod_obj_inc_layout_gen(lo);
out:
if (rc)
- lod_object_free_striping(env, lo);
+ lod_striping_free(env, lo);
RETURN(rc);
}
out:
if (rc)
- lod_object_free_striping(env, lo);
+ lod_striping_free(env, lo);
RETURN(rc);
}
dt_object_remote(dt_object_child(dt)))
RETURN(-EINVAL);
- lod_write_lock(env, dt, 0);
- rc = lod_load_striping_locked(env, lo);
+ rc = lod_striping_load(env, lo);
if (rc)
GOTO(out, rc);
break;
}
out:
- dt_write_unlock(env, dt);
RETURN(rc);
}
* \param[in] env execution environment
* \param[in] lo object
*/
-void lod_object_free_striping(const struct lu_env *env, struct lod_object *lo)
+void lod_striping_free_nolock(const struct lu_env *env, struct lod_object *lo)
{
struct lod_layout_component *lod_comp;
int i, j;
sizeof(struct dt_object *) *
lod_comp->llc_stripes_allocated);
lod_comp->llc_stripe = NULL;
+ OBD_FREE(lod_comp->llc_ost_indices,
+ sizeof(__u32) *
+ lod_comp->llc_stripes_allocated);
+ lod_comp->llc_ost_indices = NULL;
lod_comp->llc_stripes_allocated = 0;
}
lod_free_comp_entries(lo);
}
}
+void lod_striping_free(const struct lu_env *env, struct lod_object *lo)
+{
+ mutex_lock(&lo->ldo_layout_mutex);
+ lod_striping_free_nolock(env, lo);
+ mutex_unlock(&lo->ldo_layout_mutex);
+}
+
/**
* Implementation of lu_object_operations::loo_object_free.
*
struct lod_object *lo = lu2lod_obj(o);
/* release all underlying object pinned */
- lod_object_free_striping(env, lo);
+ lod_striping_free(env, lo);
lu_object_fini(o);
OBD_SLAB_FREE_PTR(lo, lod_object_kmem);
}
git://git.whamcloud.com / fs / lustre-release.git / blobdiff