From: bwzhou <bwzhou>
Date: Tue, 22 Jan 2008 06:19:08 +0000 (+0000)
Subject: Branch HEAD
X-Git-Tag: v1_7_0_51~294
X-Git-Url: https://git.whamcloud.com/gitweb?a=commitdiff_plain;h=bde1f20d315b04168e233cbcd116b207acbe6955;p=fs%2Flustre-release.git

Branch HEAD
b=13380
r=nathan, adilger

LLNL's fix for occasional failure case of test 50, 51 and 52 of recovery-small
---

diff --git a/lustre/lov/lov_qos.c b/lustre/lov/lov_qos.c
index de2ae53..37ce370 100644
--- a/lustre/lov/lov_qos.c
+++ b/lustre/lov/lov_qos.c
@@ -730,12 +730,12 @@ static int alloc_qos(struct obd_export *exp, int *idx_arr, int *stripe_cnt,
                 good_osts++;
         }
 
+        if (good_osts < stripe_cnt_min)
+                GOTO(out_up_write, rc = -EAGAIN);
+
         if (!total_bavail)
                 GOTO(out_up_write, rc = -ENOSPC);
 
-         if (good_osts < stripe_cnt_min)
-                GOTO(out_up_write, rc = -EAGAIN);
-
         /* We have enough osts */
         if (good_osts < *stripe_cnt)
                 *stripe_cnt = good_osts;