X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Flod%2Flod_lov.c;h=80e96cd5a75995d6934a1926b465e1947afd1209;hp=e3cd87a92c8c5956e2550ba9164ec4b12ba68cea;hb=de2d5808bd2987f76d2486272e1a9c192ba277d4;hpb=60e07b972114df24105a3a1bfa7365892f72a4a7;ds=sidebyside diff --git a/lustre/lod/lod_lov.c b/lustre/lod/lod_lov.c index e3cd87a..80e96cd 100644 --- a/lustre/lod/lod_lov.c +++ b/lustre/lod/lod_lov.c @@ -28,13 +28,14 @@ /* * lustre/lod/lod_lov.c * - * Author: Alex Zhuravlev + * Author: Alex Zhuravlev */ #define DEBUG_SUBSYSTEM S_MDS #include #include +#include #include "lod_internal.h" @@ -676,8 +677,8 @@ int lod_store_def_striping(const struct lu_env *env, struct dt_object *dt, v3->lmm_stripe_count = cpu_to_le16(lo->ldo_def_stripenr); v3->lmm_stripe_offset = cpu_to_le16(lo->ldo_def_stripe_offset); v3->lmm_stripe_size = cpu_to_le32(lo->ldo_def_stripe_size); - if (lo->ldo_pool) - strncpy(v3->lmm_pool_name, lo->ldo_pool, + if (lo->ldo_pool != NULL) + strlcpy(v3->lmm_pool_name, lo->ldo_pool, sizeof(v3->lmm_pool_name)); info->lti_buf.lb_buf = v3; info->lti_buf.lb_len = sizeof(*v3); @@ -739,6 +740,9 @@ int lod_initialize_objects(const struct lu_env *env, struct lod_object *lo, RETURN(-ENOMEM); for (i = 0; i < lo->ldo_stripenr; i++) { + if (unlikely(lovea_slot_is_dummy(&objs[i]))) + continue; + ostid_le_to_cpu(&objs[i].l_ost_oi, &info->lti_ostid); idx = le32_to_cpu(objs[i].l_ost_idx); rc = ostid_to_fid(&info->lti_fid, &info->lti_ostid, idx); @@ -777,6 +781,7 @@ out: lu_object_put(env, &stripe[i]->do_lu); OBD_FREE(stripe, sizeof(stripe[0]) * stripe_len); + lo->ldo_stripenr = 0; } else { lo->ldo_stripe = stripe; lo->ldo_stripes_allocated = stripe_len; @@ -839,6 +844,7 @@ out: int lod_load_striping_locked(const struct lu_env *env, struct lod_object *lo) { struct lod_thread_info *info = lod_env_info(env); + struct lu_buf *buf = &info->lti_buf; struct dt_object *next = dt_object_child(&lo->ldo_obj); int rc = 0; ENTRY; @@ -854,8 +860,7 @@ int lod_load_striping_locked(const struct lu_env *env, struct lod_object *lo) if (lo->ldo_dir_slave_stripe) GOTO(out, rc = 0); - /* only regular files can be striped */ - if (lu_object_attr(lod2lu_obj(lo)) & S_IFREG) { + if (S_ISREG(lu_object_attr(lod2lu_obj(lo)))) { rc = lod_get_lov_ea(env, lo); if (rc <= 0) GOTO(out, rc); @@ -863,20 +868,34 @@ int lod_load_striping_locked(const struct lu_env *env, struct lod_object *lo) * there is LOV EA (striping information) in this object * let's parse it and create in-core objects for the stripes */ - info->lti_buf.lb_buf = info->lti_ea_store; - info->lti_buf.lb_len = info->lti_ea_store_size; - rc = lod_parse_striping(env, lo, &info->lti_buf); - } else if (lu_object_attr(lod2lu_obj(lo)) & S_IFDIR) { + buf->lb_buf = info->lti_ea_store; + buf->lb_len = info->lti_ea_store_size; + rc = lod_parse_striping(env, lo, buf); + } else if (S_ISDIR(lu_object_attr(lod2lu_obj(lo)))) { rc = lod_get_lmv_ea(env, lo); - if (rc <= 0) - GOTO(out, rc); + if (rc < sizeof(struct lmv_mds_md_v1)) + GOTO(out, rc = rc > 0 ? -EINVAL : rc); + + buf->lb_buf = info->lti_ea_store; + buf->lb_len = info->lti_ea_store_size; + if (rc == sizeof(struct lmv_mds_md_v1)) { + rc = lod_load_lmv_shards(env, lo, buf, true); + if (buf->lb_buf != info->lti_ea_store) { + OBD_FREE_LARGE(info->lti_ea_store, + info->lti_ea_store_size); + info->lti_ea_store = buf->lb_buf; + info->lti_ea_store_size = buf->lb_len; + } + + if (rc < 0) + GOTO(out, rc); + } + /* * there is LOV EA (striping information) in this object * let's parse it and create in-core objects for the stripes */ - info->lti_buf.lb_buf = info->lti_ea_store; - info->lti_buf.lb_len = info->lti_ea_store_size; - rc = lod_parse_dir_striping(env, lo, &info->lti_buf); + rc = lod_parse_dir_striping(env, lo, buf); } out: RETURN(rc); @@ -899,8 +918,9 @@ int lod_load_striping(const struct lu_env *env, struct lod_object *lo) return rc; } +/* verify the striping information for directory */ int lod_verify_striping(struct lod_device *d, const struct lu_buf *buf, - int specific) + bool is_from_disk) { struct lov_user_md_v1 *lum; struct lov_user_md_v3 *lum3; @@ -932,8 +952,11 @@ int lod_verify_striping(struct lod_device *d, const struct lu_buf *buf, GOTO(out, rc = -EINVAL); } - if ((specific && le32_to_cpu(lum->lmm_pattern) != LOV_PATTERN_RAID0) || - (!specific && lum->lmm_pattern != 0)) { + /* the user uses "0" for default stripe pattern normally. */ + if (!is_from_disk && lum->lmm_pattern == 0) + lum->lmm_pattern = cpu_to_le32(LOV_PATTERN_RAID0); + + if (le32_to_cpu(lum->lmm_pattern) != LOV_PATTERN_RAID0) { CDEBUG(D_IOCTL, "bad userland stripe pattern: %#x\n", le32_to_cpu(lum->lmm_pattern)); GOTO(out, rc = -EINVAL); @@ -966,17 +989,17 @@ int lod_verify_striping(struct lod_device *d, const struct lu_buf *buf, } } - stripe_count = le16_to_cpu(lum->lmm_stripe_count); if (magic == LOV_USER_MAGIC_V1 || magic == LOV_MAGIC_V1_DEF) lum_size = offsetof(struct lov_user_md_v1, - lmm_objects[stripe_count]); + lmm_objects[0]); else if (magic == LOV_USER_MAGIC_V3 || magic == LOV_MAGIC_V3_DEF) lum_size = offsetof(struct lov_user_md_v3, - lmm_objects[stripe_count]); + lmm_objects[0]); else - LBUG(); + GOTO(out, rc = -EINVAL); - if (specific && buf->lb_len != lum_size) { + stripe_count = le16_to_cpu(lum->lmm_stripe_count); + if (buf->lb_len != lum_size) { CDEBUG(D_IOCTL, "invalid buf len %zd for lov_user_md with " "magic %#x and stripe_count %u\n", buf->lb_len, magic, stripe_count); @@ -1006,7 +1029,7 @@ int lod_verify_striping(struct lod_device *d, const struct lu_buf *buf, GOTO(out, rc = -EINVAL); } - if (specific && stripe_count > pool_tgt_count(pool)) { + if (is_from_disk && stripe_count > pool_tgt_count(pool)) { CDEBUG(D_IOCTL, "stripe count %u > # OSTs %u in the pool\n", stripe_count, pool_tgt_count(pool));