X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Flod%2Flod_qos.c;h=fa7eed8a1b34e0b0a132109e32b3b5d6788b2aaf;hb=14325071012bfdf9723376123079ce66c79133d2;hp=29c582a4498c7ae392248868b666da059dbf892b;hpb=89b733638db0f137b0b2b499e238284e2cdcc7ec;p=fs%2Flustre-release.git

diff --git a/lustre/lod/lod_qos.c b/lustre/lod/lod_qos.c
index 29c582a..fa7eed8 100644
--- a/lustre/lod/lod_qos.c
+++ b/lustre/lod/lod_qos.c
@@ -23,7 +23,7 @@
  * Copyright  2009 Sun Microsystems, Inc. All rights reserved
  * Use is subject to license terms.
  *
- * Copyright (c) 2012, Intel Corporation.
+ * Copyright (c) 2012, 2013, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -632,7 +632,7 @@ static inline int lod_qos_ost_in_use_clear(const struct lu_env *env, int stripes
 		CERROR("can't allocate memory for ost-in-use array\n");
 		return -ENOMEM;
 	}
-	memset(info->lti_ea_store, 0, sizeof(int) * stripes);
+	memset(info->lti_ea_store, -1, sizeof(int) * stripes);
 	return 0;
 }
 
@@ -921,6 +921,7 @@ repeat_find:
 		/*
 		 * We've successfuly declared (reserved) an object
 		 */
+		lod_qos_ost_in_use(env, stripe_num, ost_idx);
 		stripe[stripe_num] = o;
 		stripe_num++;
 
@@ -1232,13 +1233,6 @@ static int lod_use_defined_striping(const struct lu_env *env,
 		GOTO(out, rc = -EINVAL);
 	}
 
-	/*
-	 * LOD shouldn't be aware of recovery at all,
-	 * but this track recovery status (to some extent)
-	 * to be do additional checks like this one
-	 */
-	LASSERT(d->lod_recovery_completed == 0);
-
 	mo->ldo_stripe_size = le32_to_cpu(v1->lmm_stripe_size);
 	mo->ldo_stripenr = le16_to_cpu(v1->lmm_stripe_count);
 	mo->ldo_layout_gen = le16_to_cpu(v1->lmm_layout_gen);