X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Flod%2Flod_lov.c;h=1a8f09a4a222d723046bd4bcafa639288f0aa7b1;hp=a8b738ba9ede3d3398c6af9af8b884510bb3600e;hb=c8e9b796ff28a107c2f65e6857bf0a48266ed18f;hpb=fc46da199378d12f1c3d8b4b9200b815b57e8af7 diff --git a/lustre/lod/lod_lov.c b/lustre/lod/lod_lov.c index a8b738b..1a8f09a 100644 --- a/lustre/lod/lod_lov.c +++ b/lustre/lod/lod_lov.c @@ -34,7 +34,6 @@ #define DEBUG_SUBSYSTEM S_MDS #include -#include #include #include "lod_internal.h" @@ -556,14 +555,21 @@ int lod_generate_and_set_lovea(const struct lu_env *env, } for (i = 0; i < lo->ldo_stripenr; i++) { - const struct lu_fid *fid; + struct lu_fid *fid = &info->lti_fid; struct lod_device *lod; __u32 index; int type = LU_SEQ_RANGE_OST; lod = lu2lod_dev(lo->ldo_obj.do_lu.lo_dev); LASSERT(lo->ldo_stripe[i]); - fid = lu_object_fid(&lo->ldo_stripe[i]->do_lu); + + *fid = *lu_object_fid(&lo->ldo_stripe[i]->do_lu); + if (OBD_FAIL_CHECK(OBD_FAIL_LFSCK_MULTIPLE_REF)) { + if (cfs_fail_val == 0) + cfs_fail_val = fid->f_oid; + else + fid->f_oid = cfs_fail_val; + } rc = fid_to_ostid(fid, &info->lti_ostid); LASSERT(rc == 0); @@ -584,6 +590,8 @@ int lod_generate_and_set_lovea(const struct lu_env *env, info->lti_buf.lb_len = lmm_size; rc = dt_xattr_set(env, next, &info->lti_buf, XATTR_NAME_LOV, 0, th, BYPASS_CAPA); + if (rc < 0) + lod_object_free_striping(env, lo); RETURN(rc); } @@ -607,6 +615,7 @@ repeat: info->lti_buf.lb_len = info->lti_ea_store_size; rc = dt_xattr_get(env, next, &info->lti_buf, name, BYPASS_CAPA); } + /* if object is not striped or inaccessible */ if (rc == -ENODATA || rc == -ENOENT) RETURN(0); @@ -730,6 +739,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); @@ -827,28 +839,22 @@ out: RETURN(rc); } -/* - * Load and parse striping information, create in-core representation for the - * stripes - */ -int lod_load_striping(const struct lu_env *env, struct lod_object *lo) +int lod_load_striping_locked(const struct lu_env *env, struct lod_object *lo) { struct lod_thread_info *info = lod_env_info(env); struct dt_object *next = dt_object_child(&lo->ldo_obj); int rc = 0; ENTRY; - /* - * currently this code is supposed to be called from declaration - * phase only, thus the object is not expected to be locked by caller - */ - dt_write_lock(env, next, 0); /* already initialized? */ if (lo->ldo_stripe != NULL) GOTO(out, rc = 0); + if (!dt_object_exists(next)) + GOTO(out, rc = 0); + /* Do not load stripe for slaves of striped dir */ - if (!dt_object_exists(next) || lo->ldo_dir_slave_stripe) + if (lo->ldo_dir_slave_stripe) GOTO(out, rc = 0); /* only regular files can be striped */ @@ -876,12 +882,29 @@ int lod_load_striping(const struct lu_env *env, struct lod_object *lo) rc = lod_parse_dir_striping(env, lo, &info->lti_buf); } out: - dt_write_unlock(env, next); RETURN(rc); } +/** + * Load and parse striping information, create in-core representation for the + * stripes + **/ +int lod_load_striping(const struct lu_env *env, struct lod_object *lo) +{ + struct dt_object *next = dt_object_child(&lo->ldo_obj); + int rc = 0; + + /* currently this code is supposed to be called from declaration + * phase only, thus the object is not expected to be locked by caller */ + dt_write_lock(env, next, 0); + rc = lod_load_striping_locked(env, lo); + dt_write_unlock(env, next); + 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; @@ -913,8 +936,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); @@ -947,17 +973,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); @@ -987,7 +1013,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)); @@ -1007,8 +1033,8 @@ void lod_fix_desc_stripe_size(__u64 *val) if (*val != 0) LCONSOLE_INFO("Increasing default stripe size to " "minimum value %u\n", - LOV_DEFAULT_STRIPE_SIZE); - *val = LOV_DEFAULT_STRIPE_SIZE; + LOV_DESC_STRIPE_SIZE_DEFAULT); + *val = LOV_DESC_STRIPE_SIZE_DEFAULT; } else if (*val & (LOV_MIN_STRIPE_SIZE - 1)) { *val &= ~(LOV_MIN_STRIPE_SIZE - 1); LCONSOLE_WARN("Changing default stripe size to "LPU64" (a " @@ -1036,7 +1062,7 @@ void lod_fix_desc_qos_maxage(__u32 *val) { /* fix qos_maxage */ if (*val == 0) - *val = QOS_DEFAULT_MAXAGE; + *val = LOV_DESC_QOS_MAXAGE_DEFAULT; } void lod_fix_desc(struct lov_desc *desc)