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 (file)
--- 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;