From: bwzhou <bwzhou>
Date: Tue, 22 Jan 2008 05:56:04 +0000 (+0000)
Subject: Branch b1_6
X-Git-Tag: v1_8_0_110~820
X-Git-Url: https://git.whamcloud.com/gitweb?a=commitdiff_plain;h=67ebe3a1a631577cd70839c45817235a6aef1e19;p=fs%2Flustre-release.git

Branch b1_6
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 87123c8..fd136f3 100644
--- a/lustre/lov/lov_qos.c
+++ b/lustre/lov/lov_qos.c
@@ -702,12 +702,12 @@ static int alloc_qos(struct obd_export *exp, int *idx_arr, int *stripe_cnt,
                 good_osts++;
         }
 
-        if (!total_bavail)
-                GOTO(out, rc = -ENOSPC);
-
         if (good_osts < stripe_cnt_min)
                 GOTO(out, rc = -EAGAIN);
 
+        if (!total_bavail)
+                GOTO(out, rc = -ENOSPC);
+
         /* We have enough osts */
         if (good_osts < *stripe_cnt)
                 *stripe_cnt = good_osts;