From 080df3bc3052e98d79ccd7e66d06fde69f883fd9 Mon Sep 17 00:00:00 2001
From: bobijam <bobijam>
Date: Wed, 13 May 2009 09:50:21 +0000
Subject: [PATCH] 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.
---
 lustre/lov/lov_ea.c    |  7 ++++---
 lustre/tests/sanity.sh | 14 +++++++-------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/lustre/lov/lov_ea.c b/lustre/lov/lov_ea.c
index 05056b3..fcccec0 100755
--- 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 d0446ab..8b63c23 100644
--- a/lustre/tests/sanity.sh
+++ b/lustre/tests/sanity.sh
@@ -1044,7 +1044,7 @@ test_27s() { # bug 10725
 	mkdir -p $DIR/$tdir
 	local stripe_size=$((4096 * 1024 * 1024))	# 2^32
 	local stripe_count=0
-	[ $OSTCOUNT -eq 1 ] || stripe_count=2 
+	[ $OSTCOUNT -eq 1 ] || stripe_count=2
 	$SETSTRIPE $DIR/$tdir -s $stripe_size -c $stripe_count && \
 		error "stripe width >= 2^32 succeeded" || true
 }
@@ -1129,7 +1129,7 @@ test_27w() { # bug 10997
 }
 run_test 27w "check lfs setstripe -c -s -i options ============="
 
-# createtest also checks that device nodes are created and 
+# createtest also checks that device nodes are created and
 # then visible correctly (#2091)
 test_28() { # bug 2091
 	mkdir $DIR/d28
@@ -2035,7 +2035,7 @@ test_46() {
 }
 run_test 46 "dirtying a previously written page ================"
 
-# test_47 is removed "Device nodes check" is moved to test_28 
+# test_47 is removed "Device nodes check" is moved to test_28
 
 test_48a() { # bug 2399
 	check_kernel_version 34 || return 0
@@ -2960,9 +2960,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 ========================"
 
@@ -5106,7 +5106,7 @@ test_124a() {
         log "LVF=$LVF"
         local OLD_LVF=`lctl get_param -n $NSDIR.pool.lock_volume_factor`
         lctl set_param -n $NSDIR.pool.lock_volume_factor $LVF
-        
+
         # Let's make sure that we really have some margin. Client checks
         # cached locks every 10 sec.
         SLEEP=$((SLEEP+20))
-- 
1.8.3.1