#include <liblustre.h>
#endif
-#include <linux/lustre_net.h>
-#include <linux/obd.h>
-#include <linux/obd_lov.h>
-#include <linux/obd_class.h>
-#include <linux/obd_support.h>
+#include <lustre_net.h>
+#include <obd.h>
+#include <obd_lov.h>
+#include <obd_class.h>
+#include <obd_support.h>
#include <lustre/lustre_user.h>
#include "lov_internal.h"
-void lov_dump_lmm_v0(int level, struct lov_mds_md_v0 *lmm)
-{
- int i, num_ost, stripe, idx;
-
- num_ost = le32_to_cpu(lmm->lmm_ost_count);
- idx = le32_to_cpu(lmm->lmm_stripe_offset);
- CDEBUG(level, "objid "LPX64", magic 0x%08X, ost_count %u\n",
- le64_to_cpu(lmm->lmm_object_id), le32_to_cpu(lmm->lmm_magic),
- num_ost);
- CDEBUG(level,"stripe_size %u, stripe_count %u, stripe_offset %u\n",
- le32_to_cpu(lmm->lmm_stripe_size),
- le32_to_cpu(lmm->lmm_stripe_count), idx);
- for (i = stripe = 0; i < le32_to_cpu(lmm->lmm_ost_count); i++, idx++) {
- idx %= num_ost;
- if (lmm->lmm_objects[idx].l_object_id == 0)
- continue;
- CDEBUG(level, "stripe %u idx %u subobj "LPX64"\n", stripe, idx,
- le64_to_cpu(lmm->lmm_objects[idx].l_object_id));
- stripe++;
- }
-}
-
void lov_dump_lmm_v1(int level, struct lov_mds_md_v1 *lmm)
{
struct lov_ost_data_v1 *lod;
int i;
-
- CDEBUG(level, "objid "LPX64", magic 0x%08X, pattern %#X\n",
+
+ CDEBUG(level, "objid "LPX64", magic 0x%08x, pattern %#x\n",
le64_to_cpu(lmm->lmm_object_id), le32_to_cpu(lmm->lmm_magic),
le32_to_cpu(lmm->lmm_pattern));
CDEBUG(level,"stripe_size %u, stripe_count %u\n",
le64_to_cpu(lod->l_object_id));
}
+void lov_dump_lmm_join(int level, struct lov_mds_md_join *lmmj)
+{
+
+ CDEBUG(level, "objid "LPX64", magic 0x%08X, pattern %#X\n",
+ le64_to_cpu(lmmj->lmmj_md.lmm_object_id),
+ le32_to_cpu(lmmj->lmmj_md.lmm_magic),
+ le32_to_cpu(lmmj->lmmj_md.lmm_pattern));
+ CDEBUG(level,"stripe_size %u, stripe_count %u extent_count %u \n",
+ le32_to_cpu(lmmj->lmmj_md.lmm_stripe_size),
+ le32_to_cpu(lmmj->lmmj_md.lmm_stripe_count),
+ le32_to_cpu(lmmj->lmmj_extent_count));
+}
+
#define LMM_ASSERT(test) \
do { \
if (!(test)) lov_dump_lmm(D_ERROR, lmm); \
{
struct obd_device *obd = class_exp2obd(exp);
struct lov_obd *lov = &obd->u.lov;
- struct lov_oinfo *loi;
struct lov_mds_md *lmm;
int stripe_count = lov->desc.ld_tgt_count;
int lmm_size;
lmm->lmm_stripe_count = cpu_to_le32(stripe_count);
lmm->lmm_pattern = cpu_to_le32(lsm->lsm_pattern);
- for (i = 0, loi = lsm->lsm_oinfo; i < stripe_count; i++, loi++) {
+ for (i = 0; i < stripe_count; i++) {
+ struct lov_oinfo *loi = lsm->lsm_oinfo[i];
+
/* XXX LOV STACKING call down to osc_packmd() to do packing */
- LASSERT(loi->loi_id);
+ LASSERTF(loi->loi_id, "lmm_oid "LPU64" stripe %u/%u idx %u\n",
+ lmm->lmm_object_id, i, stripe_count, loi->loi_ost_idx);
lmm->lmm_objects[i].l_object_id = cpu_to_le64(loi->loi_id);
lmm->lmm_objects[i].l_object_gr = cpu_to_le64(loi->loi_gr);
lmm->lmm_objects[i].l_ost_gen = cpu_to_le32(loi->loi_ost_gen);
RETURN(lmm_size);
}
+/* Find the max stripecount we should use */
int lov_get_stripecnt(struct lov_obd *lov, int stripe_count)
{
if (!stripe_count)
stripe_count = lov->desc.ld_default_stripe_count;
- if (!stripe_count || stripe_count > lov->desc.ld_active_tgt_count)
+ if (stripe_count > lov->desc.ld_active_tgt_count)
stripe_count = lov->desc.ld_active_tgt_count;
+ if (!stripe_count)
+ stripe_count = 1;
+ /* for now, we limit the stripe count directly, when bug 4424 is
+ * fixed this needs to be somewhat dynamic based on whether ext3
+ * can handle larger EA sizes. */
+ if (stripe_count > LOV_MAX_STRIPE_COUNT)
+ stripe_count = LOV_MAX_STRIPE_COUNT;
return stripe_count;
}
-static int lov_verify_lmm_v0(struct lov_mds_md_v0 *lmm, int lmm_bytes,
- int *stripe_count)
-{
- if (lmm_bytes < sizeof(*lmm)) {
- CERROR("lov_mds_md too small: %d, need at least %d\n",
- lmm_bytes, (int)sizeof(*lmm));
- return -EINVAL;
- }
-
- *stripe_count = le16_to_cpu(lmm->lmm_stripe_count);
-
- if (*stripe_count == 0 ||
- *stripe_count > le32_to_cpu(lmm->lmm_ost_count)) {
- CERROR("bad stripe count %d\n", *stripe_count);
- lov_dump_lmm_v0(D_WARNING, lmm);
- return -EINVAL;
- }
-
- if (lmm_bytes < lov_mds_md_v0_size(*stripe_count)) {
- CERROR("LOV EA too small: %d, need %d\n",
- lmm_bytes, lov_mds_md_size(*stripe_count));
- lov_dump_lmm_v0(D_WARNING, lmm);
- return -EINVAL;
- }
-
- if (lmm->lmm_object_id == 0) {
- CERROR("zero object id\n");
- lov_dump_lmm_v0(D_WARNING, lmm);
- return -EINVAL;
- }
-
- if (le32_to_cpu(lmm->lmm_stripe_offset) >
- le32_to_cpu(lmm->lmm_ost_count)) {
- CERROR("stripe offset %d more than number of OSTs %d\n",
- le32_to_cpu(lmm->lmm_stripe_offset),
- le32_to_cpu(lmm->lmm_ost_count));
- lov_dump_lmm_v0(D_WARNING, lmm);
- return -EINVAL;
- }
-
- if (lmm->lmm_stripe_size == 0) {
- CERROR("zero stripe size\n");
- lov_dump_lmm_v0(D_WARNING, lmm);
- return -EINVAL;
- }
- return 0;
-}
-
-static int lov_verify_lmm_v1(struct lov_mds_md_v1 *lmm, int lmm_bytes,
- int *stripe_count)
+static int lov_verify_lmm(void *lmm, int lmm_bytes, int *stripe_count)
{
- if (lmm_bytes < sizeof(*lmm)) {
- CERROR("lov_mds_md too small: %d, need at least %d\n",
- lmm_bytes, (int)sizeof(*lmm));
- return -EINVAL;
- }
+ int rc;
- if (lmm->lmm_magic != le32_to_cpu(LOV_MAGIC_V1)) {
- CERROR("bad disk LOV MAGIC: 0x%08X\n",
+ if (lsm_op_find(le32_to_cpu(*(__u32 *)lmm)) == NULL) {
+ CERROR("bad disk LOV MAGIC: 0x%08X; dumping V1 LMM:\n",
le32_to_cpu(*(__u32 *)lmm));
- return -EINVAL;
- }
-
- *stripe_count = le32_to_cpu(lmm->lmm_stripe_count);
-
- if (*stripe_count == 0) {
- CERROR("bad stripe count %d\n", *stripe_count);
- lov_dump_lmm_v1(D_WARNING, lmm);
- return -EINVAL;
- }
-
- if (lmm_bytes < lov_mds_md_size(*stripe_count)) {
- CERROR("LOV EA too small: %d, need %d\n",
- lmm_bytes, lov_mds_md_size(*stripe_count));
- lov_dump_lmm_v1(D_WARNING, lmm);
- return -EINVAL;
- }
-
- if (lmm->lmm_object_id == 0) {
- CERROR("zero object id\n");
- lov_dump_lmm_v1(D_WARNING, lmm);
- return -EINVAL;
- }
-
- if (lmm->lmm_pattern != cpu_to_le32(LOV_PATTERN_RAID0)) {
- CERROR("bad striping pattern\n");
- lov_dump_lmm_v1(D_WARNING, lmm);
- return -EINVAL;
- }
-
- if (lmm->lmm_stripe_size == 0 ||
- (__u64)le32_to_cpu(lmm->lmm_stripe_size) * *stripe_count > ~0UL) {
- CERROR("bad stripe size %u\n",
- le32_to_cpu(lmm->lmm_stripe_size));
lov_dump_lmm_v1(D_WARNING, lmm);
return -EINVAL;
}
-
- return 0;
+ rc = lsm_op_find(le32_to_cpu(*(__u32 *)lmm))->lsm_lmm_verify(lmm,
+ lmm_bytes, stripe_count);
+ return rc;
}
-static int lov_verify_lmm(void *lmm, int lmm_bytes, int *stripe_count)
+int lov_alloc_memmd(struct lov_stripe_md **lsmp, int stripe_count,
+ int pattern, int magic)
{
- switch (le32_to_cpu(*(__u32 *)lmm)) {
- case LOV_MAGIC_V1:
- return lov_verify_lmm_v1(lmm, lmm_bytes, stripe_count);
- case LOV_MAGIC_V0:
- return lov_verify_lmm_v0(lmm, lmm_bytes, stripe_count);
- default:
- CERROR("bad disk LOV MAGIC: 0x%08X\n",
- le32_to_cpu(*(__u32 *)lmm));
- return -EINVAL;
- }
-}
+ int i, lsm_size;
+ ENTRY;
-int lov_alloc_memmd(struct lov_stripe_md **lsmp, int stripe_count, int pattern)
-{
- int lsm_size = lov_stripe_md_size(stripe_count);
- struct lov_oinfo *loi;
- int i;
+ CDEBUG(D_INFO, "alloc lsm, stripe_count %d\n", stripe_count);
- OBD_ALLOC(*lsmp, lsm_size);
- if (!*lsmp)
- return -ENOMEM;
+ *lsmp = lsm_alloc_plain(stripe_count, &lsm_size);
+ if (!*lsmp) {
+ CERROR("can't allocate lsmp stripe_count %d\n", stripe_count);
+ RETURN(-ENOMEM);
+ }
- (*lsmp)->lsm_magic = LOV_MAGIC;
+ spin_lock_init(&(*lsmp)->lsm_lock);
+ (*lsmp)->lsm_magic = magic;
(*lsmp)->lsm_stripe_count = stripe_count;
(*lsmp)->lsm_maxbytes = LUSTRE_STRIPE_MAXBYTES * stripe_count;
- (*lsmp)->lsm_xfersize = PTLRPC_MAX_BRW_SIZE * stripe_count;
(*lsmp)->lsm_pattern = pattern;
- (*lsmp)->lsm_oinfo[0].loi_ost_idx = ~0;
+ (*lsmp)->lsm_oinfo[0]->loi_ost_idx = ~0;
- for (i = 0, loi = (*lsmp)->lsm_oinfo; i < stripe_count; i++, loi++)
- loi_init(loi);
+ for (i = 0; i < stripe_count; i++)
+ loi_init((*lsmp)->lsm_oinfo[i]);
- return lsm_size;
+ RETURN(lsm_size);
}
void lov_free_memmd(struct lov_stripe_md **lsmp)
{
- OBD_FREE(*lsmp, lov_stripe_md_size((*lsmp)->lsm_stripe_count));
- *lsmp = NULL;
-}
+ struct lov_stripe_md *lsm = *lsmp;
-int lov_unpackmd_v0(struct lov_obd *lov, struct lov_stripe_md *lsm,
- struct lov_mds_md_v0 *lmm)
-{
- struct lov_oinfo *loi;
- int i, ost_offset, ost_count;
-
- lsm->lsm_object_id = le64_to_cpu(lmm->lmm_object_id);
- /* lsm->lsm_object_gr = 0; implicit */
- lsm->lsm_stripe_size = le32_to_cpu(lmm->lmm_stripe_size);
- lsm->lsm_xfersize = lsm->lsm_stripe_size * lsm->lsm_stripe_count;
- lsm->lsm_pattern = LOV_PATTERN_RAID0;
- ost_offset = le32_to_cpu(lmm->lmm_stripe_offset);
- ost_count = le16_to_cpu(lmm->lmm_ost_count);
-
- for (i = 0, loi = lsm->lsm_oinfo; i < ost_count; i++, ost_offset++) {
- ost_offset %= ost_count;
-
- if (!lmm->lmm_objects[ost_offset].l_object_id)
- continue;
-
- loi->loi_id =
- le64_to_cpu(lmm->lmm_objects[ost_offset].l_object_id);
- /* loi->loi_gr = 0; implicit */
- loi->loi_ost_idx = ost_offset;
- /* loi->loi_ost_gen = 0; implicit */
- loi++;
- }
-
- if (loi - lsm->lsm_oinfo != lsm->lsm_stripe_count) {
- CERROR("missing objects in lmm struct\n");
- lov_dump_lmm_v0(D_WARNING, lmm);
- return -EINVAL;
- }
+ LASSERT(lsm_op_find(lsm->lsm_magic) != NULL);
+ lsm_op_find(lsm->lsm_magic)->lsm_free(lsm);
- return 0;
+ *lsmp = NULL;
}
-int lov_unpackmd_v1(struct lov_obd *lov, struct lov_stripe_md *lsm,
- struct lov_mds_md_v1 *lmm)
-{
- struct lov_oinfo *loi;
- int i;
-
- lsm->lsm_object_id = le64_to_cpu(lmm->lmm_object_id);
- lsm->lsm_object_gr = le64_to_cpu(lmm->lmm_object_gr);
- lsm->lsm_stripe_size = le32_to_cpu(lmm->lmm_stripe_size);
- lsm->lsm_pattern = le32_to_cpu(lmm->lmm_pattern);
- lsm->lsm_xfersize = lsm->lsm_stripe_size * lsm->lsm_stripe_count;
-
- for (i = 0, loi = lsm->lsm_oinfo; i < lsm->lsm_stripe_count; i++) {
- /* XXX LOV STACKING call down to osc_unpackmd() */
- loi->loi_id = le64_to_cpu(lmm->lmm_objects[i].l_object_id);
- loi->loi_gr = le64_to_cpu(lmm->lmm_objects[i].l_object_gr);
- loi->loi_ost_idx = le32_to_cpu(lmm->lmm_objects[i].l_ost_idx);
- loi->loi_ost_gen = le32_to_cpu(lmm->lmm_objects[i].l_ost_gen);
- if (loi->loi_ost_idx > lov->desc.ld_tgt_count) {
- CERROR("OST index %d more than OST count %d\n",
- loi->loi_ost_idx, lov->desc.ld_tgt_count);
- lov_dump_lmm_v1(D_WARNING, lmm);
- return -EINVAL;
- }
- loi++;
- }
-
- return 0;
-}
/* Unpack LOV object metadata from disk storage. It is packed in LE byte
* order and is opaque to the networking layer.
*/
-int lov_unpackmd(struct obd_export *exp, struct lov_stripe_md **lsmp,
+int lov_unpackmd(struct obd_export *exp, struct lov_stripe_md **lsmp,
struct lov_mds_md *lmm, int lmm_bytes)
{
struct obd_device *obd = class_exp2obd(exp);
struct lov_obd *lov = &obd->u.lov;
int rc = 0, stripe_count, lsm_size;
+ __u32 magic;
ENTRY;
/* If passed an MDS struct use values from there, otherwise defaults */
rc = lov_verify_lmm(lmm, lmm_bytes, &stripe_count);
if (rc)
RETURN(rc);
+ magic = le32_to_cpu(lmm->lmm_magic);
} else {
stripe_count = lov_get_stripecnt(lov, 0);
+ magic = LOV_MAGIC;
}
/* If we aren't passed an lsmp struct, we just want the size */
- if (!lsmp)
+ if (!lsmp) {
/* XXX LOV STACKING call into osc for sizes */
+ LBUG();
RETURN(lov_stripe_md_size(stripe_count));
-
+ }
/* If we are passed an allocated struct but nothing to unpack, free */
if (*lsmp && !lmm) {
lov_free_memmd(lsmp);
RETURN(0);
}
- lsm_size = lov_alloc_memmd(lsmp, stripe_count, LOV_PATTERN_RAID0);
+ lsm_size = lov_alloc_memmd(lsmp, stripe_count, LOV_PATTERN_RAID0,
+ magic);
if (lsm_size < 0)
RETURN(lsm_size);
if (!lmm)
RETURN(lsm_size);
- switch (le32_to_cpu(lmm->lmm_magic)) {
- case LOV_MAGIC_V1:
- rc = lov_unpackmd_v1(lov, *lsmp, lmm);
- break;
- case LOV_MAGIC_V0:
- rc = lov_unpackmd_v0(lov, *lsmp, (void *)lmm);
- break;
- }
-
+ LASSERT(lsm_op_find(magic) != NULL);
+ rc = lsm_op_find(magic)->lsm_unpackmd(lov, *lsmp, lmm);
if (rc) {
lov_free_memmd(lsmp);
RETURN(rc);
RETURN(lsm_size);
}
-/* Configure object striping information on a new file.
- *
- * @lmmu is a pointer to a user struct with one or more of the fields set to
- * indicate the application preference: lmm_stripe_count, lmm_stripe_size,
- * lmm_stripe_offset, and lmm_stripe_pattern. lmm_magic must be LOV_MAGIC.
- * @lsmp is a pointer to an in-core stripe MD that needs to be filled in.
- */
-int lov_setstripe(struct obd_export *exp, struct lov_stripe_md **lsmp,
- struct lov_user_md *lump)
+static int __lov_setstripe(struct obd_export *exp, struct lov_stripe_md **lsmp,
+ struct lov_user_md *lump)
{
struct obd_device *obd = class_exp2obd(exp);
struct lov_obd *lov = &obd->u.lov;
RETURN(-EFAULT);
if (lum.lmm_magic != LOV_USER_MAGIC) {
- CDEBUG(D_IOCTL, "bad userland LOV MAGIC: %#08x != %#08x\n",
- lum.lmm_magic, LOV_USER_MAGIC);
- RETURN(-EINVAL);
+ if (lum.lmm_magic == __swab32(LOV_USER_MAGIC)) {
+ lustre_swab_lov_user_md(&lum);
+ } else {
+ CDEBUG(D_IOCTL, "bad userland LOV MAGIC:"
+ " %#08x != %#08x\n",
+ lum.lmm_magic, LOV_USER_MAGIC);
+ RETURN(-EINVAL);
+ }
}
if (lum.lmm_pattern == 0) {
RETURN(-EINVAL);
}
- if (lum.lmm_stripe_size & (PAGE_SIZE - 1)) {
- CDEBUG(D_IOCTL, "stripe size %u not multiple of %lu\n",
- lum.lmm_stripe_size, PAGE_SIZE);
- RETURN(-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);
+ lum.lmm_stripe_size = LOV_MIN_STRIPE_SIZE;
}
- if ((lum.lmm_stripe_offset >= lov->desc.ld_active_tgt_count) &&
+ if ((lum.lmm_stripe_offset >= lov->desc.ld_tgt_count) &&
(lum.lmm_stripe_offset != (typeof(lum.lmm_stripe_offset))(-1))) {
- CDEBUG(D_IOCTL, "stripe offset %u > number of active OSTs %u\n",
- lum.lmm_stripe_offset, lov->desc.ld_active_tgt_count);
+ CDEBUG(D_IOCTL, "stripe offset %u > number of OSTs %u\n",
+ lum.lmm_stripe_offset, lov->desc.ld_tgt_count);
RETURN(-EINVAL);
}
stripe_count = lov_get_stripecnt(lov, lum.lmm_stripe_count);
if ((__u64)lum.lmm_stripe_size * stripe_count > ~0UL) {
- CDEBUG(D_IOCTL, "stripe width %ux%u > %lu on 32-bit system\n",
+ CDEBUG(D_IOCTL, "stripe width %ux%i exeeds %lu bytes\n",
lum.lmm_stripe_size, (int)lum.lmm_stripe_count, ~0UL);
RETURN(-EINVAL);
}
- rc = lov_alloc_memmd(lsmp, stripe_count, lum.lmm_pattern);
+ rc = lov_alloc_memmd(lsmp, stripe_count, lum.lmm_pattern, LOV_MAGIC);
- if (rc < 0)
- RETURN(rc);
-
- (*lsmp)->lsm_oinfo[0].loi_ost_idx = lum.lmm_stripe_offset;
- (*lsmp)->lsm_stripe_size = lum.lmm_stripe_size;
- (*lsmp)->lsm_xfersize = lum.lmm_stripe_size * stripe_count;
+ if (rc >= 0) {
+ (*lsmp)->lsm_oinfo[0]->loi_ost_idx = lum.lmm_stripe_offset;
+ (*lsmp)->lsm_stripe_size = lum.lmm_stripe_size;
+ rc = 0;
+ }
RETURN(0);
}
-int lov_setea(struct obd_export *exp, struct lov_stripe_md **lsmp,
+/* Configure object striping information on a new file.
+ *
+ * @lmmu is a pointer to a user struct with one or more of the fields set to
+ * indicate the application preference: lmm_stripe_count, lmm_stripe_size,
+ * lmm_stripe_offset, and lmm_stripe_pattern. lmm_magic must be LOV_MAGIC.
+ * @lsmp is a pointer to an in-core stripe MD that needs to be filled in.
+ */
+int lov_setstripe(struct obd_export *exp, struct lov_stripe_md **lsmp,
struct lov_user_md *lump)
{
+ int rc;
+ mm_segment_t seg;
+
+ seg = get_fs();
+ set_fs(KERNEL_DS);
+
+ rc = __lov_setstripe(exp, lsmp, lump);
+ set_fs(seg);
+ RETURN(rc);
+}
+
+int lov_setea(struct obd_export *exp, struct lov_stripe_md **lsmp,
+ struct lov_user_md *lump)
+{
int i;
int rc;
struct obd_export *oexp;
struct lov_obd *lov = &exp->exp_obd->u.lov;
obd_id last_id = 0;
+ ENTRY;
for (i = 0; i < lump->lmm_stripe_count; i++) {
__u32 len = sizeof(last_id);
- oexp = lov->tgts[lump->lmm_objects[i].l_ost_idx].ltd_exp;
+ oexp = lov->lov_tgts[lump->lmm_objects[i].l_ost_idx]->ltd_exp;
rc = obd_get_info(oexp, strlen("last_id"), "last_id",
&len, &last_id);
if (rc)
RETURN(rc);
for (i = 0; i < lump->lmm_stripe_count; i++) {
- (*lsmp)->lsm_oinfo[i].loi_ost_idx =
+ (*lsmp)->lsm_oinfo[i]->loi_ost_idx =
lump->lmm_objects[i].l_ost_idx;
- (*lsmp)->lsm_oinfo[i].loi_id = lump->lmm_objects[i].l_object_id;
- (*lsmp)->lsm_oinfo[i].loi_gr = lump->lmm_objects[i].l_object_gr;
+ (*lsmp)->lsm_oinfo[i]->loi_id = lump->lmm_objects[i].l_object_id;
+ (*lsmp)->lsm_oinfo[i]->loi_gr = lump->lmm_objects[i].l_object_gr;
}
RETURN(0);
}
int lov_getstripe(struct obd_export *exp, struct lov_stripe_md *lsm,
struct lov_user_md *lump)
{
+ /*
+ * XXX huge struct allocated on stack.
+ */
struct lov_user_md lum;
struct lov_mds_md *lmmk = NULL;
int rc, lmm_size;
+ mm_segment_t seg;
ENTRY;
if (!lsm)
RETURN(-ENODATA);
+ /*
+ * "Switch to kernel segment" to allow copying from kernel space by
+ * copy_{to,from}_user().
+ */
+ seg = get_fs();
+ set_fs(KERNEL_DS);
rc = copy_from_user(&lum, lump, sizeof(lum));
if (rc)
- RETURN(-EFAULT);
-
- if (lum.lmm_magic != LOV_USER_MAGIC)
- RETURN(-EINVAL);
-
- rc = lov_packmd(exp, &lmmk, lsm);
- if (rc < 0)
- RETURN(rc);
- lmm_size = rc;
- rc = 0;
-
- /* FIXME: Bug 1185 - copy fields properly when structs change */
- LASSERT(sizeof(lum) == sizeof(*lmmk));
- LASSERT(sizeof(lum.lmm_objects[0]) == sizeof(lmmk->lmm_objects[0]));
-
- /* User wasn't expecting this many OST entries */
- if (lum.lmm_stripe_count == 0) {
- if (copy_to_user(lump, lmmk, sizeof(lum)))
- 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;
- }
-
- obd_free_diskmd(exp, &lmmk);
+ else if (lum.lmm_magic != LOV_USER_MAGIC)
+ rc = -EINVAL;
+ else {
+ rc = lov_packmd(exp, &lmmk, lsm);
+ if (rc < 0)
+ RETURN(rc);
+ lmm_size = rc;
+ rc = 0;
+
+ /* FIXME: Bug 1185 - copy fields properly when structs change */
+ CLASSERT(sizeof lum == sizeof *lmmk);
+ CLASSERT(sizeof lum.lmm_objects[0] ==
+ sizeof lmmk->lmm_objects[0]);
+
+ /* User wasn't expecting this many OST entries */
+ if (lum.lmm_stripe_count == 0) {
+ if (copy_to_user(lump, lmmk, sizeof lum))
+ rc = -EFAULT;
+ } else if (lum.lmm_stripe_count < lmmk->lmm_stripe_count) {
+ rc = -EOVERFLOW;
+ } else if (copy_to_user(lump, lmmk, sizeof lum))
+ rc = -EFAULT;
+ obd_free_diskmd(exp, &lmmk);
+ }
+ set_fs(seg);
RETURN(rc);
}
git://git.whamcloud.com / fs / lustre-release.git / blobdiff