* (Un)packing of OST/MDS requests
*
*/
-
-#define DEBUG_SUBSYSTEM S_LLITE
+#ifndef EXPORT_SYMTAB
+# define EXPORT_SYMTAB
+#endif
+#define DEBUG_SUBSYSTEM S_LOV
#ifndef __KERNEL__
#include <liblustre.h>
#endif
#include <linux/obd_lov.h>
#include <linux/obd_class.h>
#include <linux/obd_support.h>
-#include <linux/lustre_user.h>
+#include <lustre/lustre_user.h>
#include "lov_internal.h"
if (lsm) {
if (lsm->lsm_magic != LOV_MAGIC) {
- CERROR("bad mem LOV MAGIC: 0x%08X != 0x%08X\n",
+ CWARN("bad LOV MAGIC: 0x%08X != 0x%08X\n",
lsm->lsm_magic, LOV_MAGIC);
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));
+ lmm_bytes, lov_mds_md_v0_size(*stripe_count));
lov_dump_lmm_v0(D_WARNING, lmm);
return -EINVAL;
}
return -EINVAL;
}
- if (lmm_bytes < lov_mds_md_size(*stripe_count)) {
+ if (lmm_bytes < lov_mds_md_v1_size(*stripe_count)) {
CERROR("LOV EA too small: %d, need %d\n",
- lmm_bytes, lov_mds_md_size(*stripe_count));
+ lmm_bytes, lov_mds_md_v1_size(*stripe_count));
lov_dump_lmm_v1(D_WARNING, lmm);
return -EINVAL;
}
(*lsmp)->lsm_magic = LOV_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;
return lsm_size;
}
+EXPORT_SYMBOL(lov_alloc_memmd);
void lov_free_memmd(struct lov_stripe_md **lsmp)
{
OBD_FREE(*lsmp, lov_stripe_md_size((*lsmp)->lsm_stripe_count));
*lsmp = NULL;
}
+EXPORT_SYMBOL(lov_free_memmd);
int lov_unpackmd_v0(struct lov_obd *lov, struct lov_stripe_md *lsm,
struct lov_mds_md_v0 *lmm)
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);
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_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) {
+ 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);
(*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;
RETURN(0);
}
+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;
+
+ 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;
+ rc = obd_get_info(oexp, strlen("last_id"), "last_id",
+ &len, &last_id);
+ if (rc)
+ RETURN(rc);
+ if (lump->lmm_objects[i].l_object_id > last_id) {
+ CERROR("Setting EA for object > than last id on "
+ "ost idx %d "LPD64" > "LPD64" \n",
+ lump->lmm_objects[i].l_ost_idx,
+ lump->lmm_objects[i].l_object_id, last_id);
+ RETURN(-EINVAL);
+ }
+ }
+
+ rc = lov_setstripe(exp, lsmp, lump);
+ if (rc)
+ RETURN(rc);
+
+ for (i = 0; i < lump->lmm_stripe_count; i++) {
+ (*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;
+ }
+ RETURN(0);
+}
+
+
/* Retrieve object striping information.
*
* @lump is a pointer to an in-core struct with lmm_ost_count indicating
LASSERT(sizeof(lum.lmm_objects[0]) == sizeof(lmmk->lmm_objects[0]));
/* User wasn't expecting this many OST entries */
- if (lum.lmm_stripe_count < lmmk->lmm_stripe_count)
+ if (lum.lmm_stripe_count == 0) {
+ rc = copy_to_user(lump, lmmk, sizeof(lum));
+ if (rc)
+ rc = -EFAULT;
+ } else if (lum.lmm_stripe_count < lmmk->lmm_stripe_count) {
rc = -EOVERFLOW;
- else if (copy_to_user(lump, lmmk, lmm_size))
+ } else if (copy_to_user(lump, lmmk, lmm_size)) {
rc = -EFAULT;
+ }
obd_free_diskmd(exp, &lmmk);
git://git.whamcloud.com / fs / lustre-release.git / blobdiff