From f261155f42c5ec8da17da80f06e543d5a2f70019 Mon Sep 17 00:00:00 2001
From: johann <johann>
Date: Mon, 6 Oct 2008 12:08:51 +0000
Subject: [PATCH] Branch b1_6 b=17261 i=adilger i=shadow
cap lmm_size to LOV_MAX_STRIPE_COUNT.
---
lustre/lov/lov_pack.c | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/lustre/lov/lov_pack.c b/lustre/lov/lov_pack.c
index 9a2674079c..ee1ef82311 100644
--- a/lustre/lov/lov_pack.c
+++ b/lustre/lov/lov_pack.c
@@ -115,7 +115,7 @@ int lov_packmd(struct obd_export *exp, struct lov_mds_md **lmmp,
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 stripe_count;
int lmm_size;
int i;
ENTRY;
@@ -132,6 +132,13 @@ int lov_packmd(struct obd_export *exp, struct lov_mds_md **lmmp,
} else {
stripe_count = lsm->lsm_stripe_count;
}
+ } else {
+ /* No needs to allocated more than LOV_MAX_STRIPE_COUNT.
+ * Anyway, this is pretty inaccurate since ld_tgt_count now
+ * represents max index and we should rely on the actual number
+ * of OSTs instead */
+ stripe_count = min(LOV_MAX_STRIPE_COUNT,
+ lov->desc.ld_tgt_count);
}
/* XXX LOV STACKING call into osc for sizes */
--
GitLab