int rc;
ENTRY;
- rc = copy_from_user(&lumv3, lump, sizeof(struct lov_user_md_v1));
- if (rc)
+ if (copy_from_user(&lumv3, lump, sizeof(struct lov_user_md_v1)))
RETURN(-EFAULT);
lmm_magic = lumv1->lmm_magic;
lustre_swab_lov_user_md_v1(lumv1);
lmm_magic = LOV_USER_MAGIC_V1;
} else if (lmm_magic == LOV_USER_MAGIC_V3) {
- rc = copy_from_user(&lumv3, lump, sizeof(lumv3));
- if (rc)
+ if (copy_from_user(&lumv3, lump, sizeof(lumv3)))
RETURN(-EFAULT);
} else if (lmm_magic == __swab32(LOV_USER_MAGIC_V3)) {
- rc = copy_from_user(&lumv3, lump, sizeof(lumv3));
- if (rc)
+ if (copy_from_user(&lumv3, lump, sizeof(lumv3)))
RETURN(-EFAULT);
lustre_swab_lov_user_md_v3(&lumv3);
lmm_magic = LOV_USER_MAGIC_V3;
(typeof(lumv3.lmm_stripe_offset))(-1)) {
rc = lov_check_index_in_pool(lumv3.lmm_stripe_offset,
pool);
- if (rc < 0)
+ if (rc < 0) {
+ lov_pool_putref(pool);
RETURN(-EINVAL);
+ }
}
if (stripe_count > pool_tgt_count(pool))
stripe_count = pool_tgt_count(pool);
+
+ lov_pool_putref(pool);
}
if ((__u64)lumv1->lmm_stripe_size * stripe_count > ~0UL) {
/* we only need the header part from user space to get lmm_magic and
* lmm_stripe_count, (the header part is common to v1 and v3) */
lum_size = sizeof(struct lov_user_md_v1);
- rc = copy_from_user(&lum, lump, lum_size);
-
- if (rc)
+ if (copy_from_user(&lum, lump, lum_size))
rc = -EFAULT;
else if ((lum.lmm_magic != LOV_USER_MAGIC) &&
(lum.lmm_magic != LOV_USER_MAGIC_V3))
CLASSERT(sizeof lum.lmm_objects[0] ==
sizeof lmmk->lmm_objects[0]);
+ if ((cpu_to_le32(LOV_MAGIC) != LOV_MAGIC) &&
+ (lmmk->lmm_magic == cpu_to_le32(LOV_MAGIC)))
+ lustre_swab_lov_mds_md(lmmk);
/* User wasn't expecting this many OST entries */
if (lum.lmm_stripe_count == 0) {
- if (copy_to_user(lump, lmmk, lum_size))
+ copy_lov_mds2user(&lum, lmmk);
+ if (copy_to_user(lump, &lum, lum_size))
rc = -EFAULT;
} else if (lum.lmm_stripe_count < lmmk->lmm_stripe_count) {
rc = -EOVERFLOW;
- } else if (copy_to_user(lump, lmmk, lmm_size))
- rc = -EFAULT;
+ } else {
+ copy_lov_mds2user(&lum, lmmk);
+ if (copy_to_user(lump, &lum, lmm_size))
+ rc = -EFAULT;
+ }
obd_free_diskmd(exp, &lmmk);
}