* Copyright 2009 Sun Microsystems, Inc. All rights reserved
* Use is subject to license terms.
*
- * Copyright (c) 2012, Intel Corporation.
+ * Copyright (c) 2012, 2013, Intel Corporation.
*/
/*
* lustre/lod/lod_lov.c
OBD_CONNECT_MDS_MDS |
OBD_CONNECT_FID |
OBD_CONNECT_AT |
- OBD_CONNECT_FULL20 |
- OBD_CONNECT_PINGLESS;
+ OBD_CONNECT_FULL20;
/* XXX set MDS-MDS flags, remove this when running this
* on client*/
data->ocd_connect_flags |= OBD_CONNECT_MDS_MDS;
}
LASSERT(obd->obd_lu_dev);
- LASSERT(obd->obd_lu_dev->ld_site = lod->lod_dt_dev.dd_lu_dev.ld_site);
+ LASSERT(obd->obd_lu_dev->ld_site == lod->lod_dt_dev.dd_lu_dev.ld_site);
ldev = obd->obd_lu_dev;
d = lu2dt_dev(ldev);
lmm->lmm_magic = cpu_to_le32(magic);
lmm->lmm_pattern = cpu_to_le32(LOV_PATTERN_RAID0);
- lmm->lmm_object_id = cpu_to_le64(fid_ver_oid(fid));
- lmm->lmm_object_seq = cpu_to_le64(fid_seq(fid));
+ fid_to_lmm_oi(fid, &lmm->lmm_oi);
+ lmm_oi_cpu_to_le(&lmm->lmm_oi, &lmm->lmm_oi);
lmm->lmm_stripe_size = cpu_to_le32(lo->ldo_stripe_size);
lmm->lmm_stripe_count = cpu_to_le16(lo->ldo_stripenr);
lmm->lmm_layout_gen = 0;
LASSERT(lo->ldo_stripe[i]);
fid = lu_object_fid(&lo->ldo_stripe[i]->do_lu);
- rc = fid_ostid_pack(fid, &info->lti_ostid);
+ rc = fid_to_ostid(fid, &info->lti_ostid);
LASSERT(rc == 0);
- objs[i].l_object_id = cpu_to_le64(info->lti_ostid.oi_id);
- objs[i].l_object_seq = cpu_to_le64(info->lti_ostid.oi_seq);
+ ostid_cpu_to_le(&info->lti_ostid, &objs[i].l_ost_oi);
objs[i].l_ost_gen = cpu_to_le32(0);
rc = lod_fld_lookup(env, lod, fid, &index, LU_SEQ_RANGE_OST);
if (rc < 0) {
v3->lmm_magic = cpu_to_le32(LOV_MAGIC_V3);
v3->lmm_pattern = cpu_to_le32(LOV_PATTERN_RAID0);
- v3->lmm_object_id = 0;
- v3->lmm_object_seq = 0;
v3->lmm_stripe_size = cpu_to_le32(lo->ldo_def_stripe_size);
v3->lmm_stripe_count = cpu_to_le16(lo->ldo_def_stripenr);
v3->lmm_stripe_offset = cpu_to_le16(lo->ldo_def_stripe_offset);
RETURN(-ENOMEM);
for (i = 0; i < lo->ldo_stripenr; i++) {
- info->lti_ostid.oi_id = le64_to_cpu(objs[i].l_object_id);
- info->lti_ostid.oi_seq = le64_to_cpu(objs[i].l_object_seq);
+ ostid_le_to_cpu(&objs[i].l_ost_oi, &info->lti_ostid);
idx = le64_to_cpu(objs[i].l_ost_idx);
- fid_ostid_unpack(&info->lti_fid, &info->lti_ostid, idx);
+ rc = ostid_to_fid(&info->lti_fid, &info->lti_ostid, idx);
+ if (rc != 0)
+ GOTO(out, rc);
LASSERTF(fid_is_sane(&info->lti_fid), ""DFID" insane!\n",
PFID(&info->lti_fid));
/*
int specific)
{
struct lov_user_md_v1 *lum;
- struct lov_user_md_v3 *v3 = NULL;
+ struct lov_user_md_v3 *lum3;
struct pool_desc *pool = NULL;
- int rc;
+ __u32 magic;
+ __u32 stripe_size;
+ __u16 stripe_count;
+ __u16 stripe_offset;
+ size_t lum_size;
+ int rc = 0;
ENTRY;
lum = buf->lb_buf;
- if (lum->lmm_magic != LOV_USER_MAGIC_V1 &&
- lum->lmm_magic != LOV_USER_MAGIC_V3 &&
- lum->lmm_magic != LOV_MAGIC_V1_DEF &&
- lum->lmm_magic != LOV_MAGIC_V3_DEF) {
- CDEBUG(D_IOCTL, "bad userland LOV MAGIC: %#x\n",
- lum->lmm_magic);
- RETURN(-EINVAL);
+ LASSERT(sizeof(*lum) < sizeof(*lum3));
+
+ if (buf->lb_len < sizeof(*lum)) {
+ CDEBUG(D_IOCTL, "buf len %zd too small for lov_user_md\n",
+ buf->lb_len);
+ GOTO(out, rc = -EINVAL);
+ }
+
+ magic = le32_to_cpu(lum->lmm_magic);
+ if (magic != LOV_USER_MAGIC_V1 &&
+ magic != LOV_USER_MAGIC_V3 &&
+ magic != LOV_MAGIC_V1_DEF &&
+ magic != LOV_MAGIC_V3_DEF) {
+ CDEBUG(D_IOCTL, "bad userland LOV MAGIC: %#x\n", magic);
+ GOTO(out, rc = -EINVAL);
}
- if ((specific && lum->lmm_pattern != LOV_PATTERN_RAID0) ||
- (specific == 0 && lum->lmm_pattern != 0)) {
+ if ((specific && le32_to_cpu(lum->lmm_pattern) != LOV_PATTERN_RAID0) ||
+ (!specific && lum->lmm_pattern != 0)) {
CDEBUG(D_IOCTL, "bad userland stripe pattern: %#x\n",
- lum->lmm_pattern);
- RETURN(-EINVAL);
+ le32_to_cpu(lum->lmm_pattern));
+ GOTO(out, rc = -EINVAL);
}
/* 64kB is the largest common page size we see (ia64), and matches the
* check in lfs */
- if (lum->lmm_stripe_size & (LOV_MIN_STRIPE_SIZE - 1)) {
- CDEBUG(D_IOCTL, "stripe size %u not multiple of %u, fixing\n",
- lum->lmm_stripe_size, LOV_MIN_STRIPE_SIZE);
- RETURN(-EINVAL);
+ stripe_size = le32_to_cpu(lum->lmm_stripe_size);
+ if (stripe_size & (LOV_MIN_STRIPE_SIZE - 1)) {
+ CDEBUG(D_IOCTL, "stripe size %u not a multiple of %u\n",
+ stripe_size, LOV_MIN_STRIPE_SIZE);
+ GOTO(out, rc = -EINVAL);
}
/* an offset of -1 is treated as a "special" valid offset */
- if (lum->lmm_stripe_offset != (typeof(lum->lmm_stripe_offset))(-1)) {
+ stripe_offset = le16_to_cpu(lum->lmm_stripe_offset);
+ if (stripe_offset != (typeof(stripe_offset))-1) {
/* if offset is not within valid range [0, osts_size) */
- if (lum->lmm_stripe_offset >= d->lod_osts_size) {
+ if (stripe_offset >= d->lod_osts_size) {
CDEBUG(D_IOCTL, "stripe offset %u >= bitmap size %u\n",
- lum->lmm_stripe_offset, d->lod_osts_size);
- RETURN(-EINVAL);
+ stripe_offset, d->lod_osts_size);
+ GOTO(out, rc = -EINVAL);
}
/* if lmm_stripe_offset is *not* in bitmap */
- if (!cfs_bitmap_check(d->lod_ost_bitmap,
- lum->lmm_stripe_offset)) {
+ if (!cfs_bitmap_check(d->lod_ost_bitmap, stripe_offset)) {
CDEBUG(D_IOCTL, "stripe offset %u not in bitmap\n",
- lum->lmm_stripe_offset);
- RETURN(-EINVAL);
+ stripe_offset);
+ GOTO(out, rc = -EINVAL);
}
}
- if (lum->lmm_magic == LOV_USER_MAGIC_V3)
- v3 = buf->lb_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]);
+ else if (magic == LOV_USER_MAGIC_V3 || magic == LOV_MAGIC_V3_DEF)
+ lum_size = offsetof(struct lov_user_md_v3,
+ lmm_objects[stripe_count]);
+ else
+ LBUG();
+
+ if (specific && 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);
+ GOTO(out, rc = -EINVAL);
+ }
- if (v3)
- /* In the function below, .hs_keycmp resolves to
- * pool_hashkey_keycmp() */
- /* coverity[overrun-buffer-val] */
- pool = lod_find_pool(d, v3->lmm_pool_name);
+ if (!(magic == LOV_USER_MAGIC_V3 || magic == LOV_MAGIC_V3_DEF))
+ goto out;
- if (pool != NULL) {
- __u16 offs = v3->lmm_stripe_offset;
+ lum3 = buf->lb_buf;
+ if (buf->lb_len < sizeof(*lum3)) {
+ CDEBUG(D_IOCTL, "buf len %zd too small for lov_user_md_v3\n",
+ buf->lb_len);
+ GOTO(out, rc = -EINVAL);
+ }
- if (offs != (typeof(v3->lmm_stripe_offset))(-1)) {
- rc = lod_check_index_in_pool(offs, pool);
- if (rc < 0) {
- lod_pool_putref(pool);
- RETURN(-EINVAL);
- }
- }
+ /* In the function below, .hs_keycmp resolves to
+ * pool_hashkey_keycmp() */
+ /* coverity[overrun-buffer-val] */
+ pool = lod_find_pool(d, lum3->lmm_pool_name);
+ if (pool == NULL)
+ goto out;
+
+ if (stripe_offset != (typeof(stripe_offset))-1) {
+ rc = lod_check_index_in_pool(stripe_offset, pool);
+ if (rc < 0)
+ GOTO(out, rc = -EINVAL);
+ }
- if (specific && lum->lmm_stripe_count > pool_tgt_count(pool)) {
- CDEBUG(D_IOCTL,
- "stripe count %u > # OSTs %u in the pool\n",
- lum->lmm_stripe_count, pool_tgt_count(pool));
- lod_pool_putref(pool);
- RETURN(-EINVAL);
- }
+ if (specific && stripe_count > pool_tgt_count(pool)) {
+ CDEBUG(D_IOCTL,
+ "stripe count %u > # OSTs %u in the pool\n",
+ stripe_count, pool_tgt_count(pool));
+ GOTO(out, rc = -EINVAL);
+ }
+out:
+ if (pool != NULL)
lod_pool_putref(pool);
- }
- RETURN(0);
+ RETURN(rc);
}
void lod_fix_desc_stripe_size(__u64 *val)
{
- if (*val < LOV_DEFAULT_STRIPE_SIZE) {
- LCONSOLE_WARN("Increasing default stripe size to min %u\n",
- LOV_DEFAULT_STRIPE_SIZE);
+ if (*val < LOV_MIN_STRIPE_SIZE) {
+ if (*val != 0)
+ LCONSOLE_INFO("Increasing default stripe size to "
+ "minimum value %u\n",
+ LOV_DEFAULT_STRIPE_SIZE);
*val = LOV_DEFAULT_STRIPE_SIZE;
} else if (*val & (LOV_MIN_STRIPE_SIZE - 1)) {
*val &= ~(LOV_MIN_STRIPE_SIZE - 1);
git://git.whamcloud.com / fs / lustre-release.git / blobdiff