Branch b_release_1_8_0

b=19478
i=johann
i=sheng.yang

Port back patch from bz12836 to handle slow run of sanity test_65l.

diff --git a/lustre/lov/lov_ea.c b/lustre/lov/lov_ea.c
index 05056b3..fcccec0 100755 (executable)
--- a/lustre/lov/lov_ea.c
+++ b/lustre/lov/lov_ea.c
@@ -85,7 +85,8 @@ static int lsm_lmm_verify_common(struct lov_mds_md *lmm, int lmm_bytes,
         }
 
         if (lmm->lmm_stripe_size == 0 ||
-             (le32_to_cpu(lmm->lmm_stripe_size)&(LOV_MIN_STRIPE_SIZE-1)) != 0) {
+             (stripe_count != -1 &&
+             (le32_to_cpu(lmm->lmm_stripe_size)&(LOV_MIN_STRIPE_SIZE-1)) != 0)){
                 CERROR("bad stripe size %u\n",
                        le32_to_cpu(lmm->lmm_stripe_size));
                 lov_dump_lmm(D_WARNING, lmm);
@@ -498,7 +499,7 @@ static int lsm_revalidate_join(struct lov_stripe_md *lsm,
         OBD_ALLOC(lsm->lsm_array->lai_ext_array,lsm->lsm_array->lai_ext_count *
                                                 sizeof (struct lov_extent));
         if (!lsm->lsm_array->lai_ext_array)
-                GOTO(release_ctxt, rc = -ENOMEM);        
+                GOTO(release_ctxt, rc = -ENOMEM);
 
         CDEBUG(D_INFO, "get lsm logid: "LPU64":"LPU64"\n",
                lsm->lsm_array->lai_array_id.lgl_oid,
@@ -524,7 +525,7 @@ release_ctxt:
         RETURN(rc);
 }
 
-int lsm_destroy_join(struct lov_stripe_md *lsm, struct obdo *oa, 
+int lsm_destroy_join(struct lov_stripe_md *lsm, struct obdo *oa,
                       struct obd_export *md_exp)
 {
         struct llog_ctxt *ctxt;

diff --git a/lustre/tests/sanity.sh b/lustre/tests/sanity.sh
index 298b12c..2dfaa44 100644 (file)
--- a/lustre/tests/sanity.sh
+++ b/lustre/tests/sanity.sh
@@ -2981,9 +2981,9 @@ test_65k() { # bug11679
 run_test 65k "validate manual striping works properly with deactivated OSCs"
 
 test_65l() { # bug 12836
-       mkdir -p $DIR/$tdir
-       $SETSTRIPE $DIR/$tdir -c -1
-       $LFS find -mtime -1 $DIR >/dev/null
+       mkdir -p $DIR/$tdir/test_dir
+       $SETSTRIPE $DIR/$tdir/test_dir -c -1
+       $LFS find -mtime -1 $DIR/$tdir > /dev/null
 }
 run_test 65l "lfs find on -1 stripe dir ========================"