X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Flov%2Flov_pack.c;h=60d530b3c1c4d83b61270ea43b8a6406ba2a80cc;hp=e657eedefd0a67f603b6ee2ebd18f4df8eec1fc4;hb=2f1beb33144523467b596f4b6fab882b0a839187;hpb=d41716533682ed88b8a77654f9b5b050ef5c672c

diff --git a/lustre/lov/lov_pack.c b/lustre/lov/lov_pack.c
index e657eed..60d530b 100644
--- a/lustre/lov/lov_pack.c
+++ b/lustre/lov/lov_pack.c
@@ -389,8 +389,8 @@ int lov_getstripe(const struct lu_env *env, struct lov_object *obj,
 	struct lov_mds_md *lmmk, *lmm;
 	struct lov_foreign_md *lfm;
 	struct lov_user_md_v1 lum;
-	size_t lmmk_size;
-	ssize_t lmm_size, lum_size = 0;
+	size_t lmmk_size, lum_size = 0;
+	ssize_t lmm_size;
 	static bool printed;
 	int rc = 0;
 
@@ -488,10 +488,11 @@ int lov_getstripe(const struct lu_env *env, struct lov_object *obj,
 				i--;
 			comp_md = (struct lov_mds_md *)((char *)comp_v1 +
 					comp_v1->lcm_entries[i].lcme_offset);
+			lum_size = comp_v1->lcm_entries[i].lcme_size;
 		}
 
 		lmm = comp_md;
-		lmm_size = lum_size;
+		lmm_size = min(lum_size, lmmk_size);
 	} else {
 		lmm = lmmk;
 		lmm_size = lmmk_size;