X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Flod%2Flod_pool.c;h=98b24167a44f2f3e618085bb5fd28fe88d360fb5;hb=a674871d5f9e4819b3428593e24df6e52096612f;hp=df05ba9296780948a3d3aa214becc0225a9c60c5;hpb=9fb46705ae86aa2c0ac29427f0ff24f923560eb7;p=fs%2Flustre-release.git

diff --git a/lustre/lod/lod_pool.c b/lustre/lod/lod_pool.c
index df05ba9..98b2416 100644
--- a/lustre/lod/lod_pool.c
+++ b/lustre/lod/lod_pool.c
@@ -26,6 +26,8 @@
 /*
  * Copyright  2008 Sun Microsystems, Inc. All rights reserved
  * Use is subject to license terms.
+ *
+ * Copyright (c) 2012, 2013, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -252,7 +254,7 @@ static void pool_proc_stop(struct seq_file *s, void *v)
 static int pool_proc_show(struct seq_file *s, void *v)
 {
 	struct pool_iterator *iter = (struct pool_iterator *)v;
-	struct lod_ost_desc  *osc_desc;
+	struct lod_tgt_desc  *osc_desc;
 
 	LASSERTF(iter->magic == POOL_IT_MAGIC, "%08X", iter->magic);
 	LASSERT(iter->pool != NULL);
@@ -450,7 +452,7 @@ int lod_pool_new(struct obd_device *obd, char *poolname)
 	if (rc)
 		GOTO(out_err, rc);
 
-	memset(&(new_pool->pool_rr), 0, sizeof(struct lov_qos_rr));
+	memset(&new_pool->pool_rr, 0, sizeof(new_pool->pool_rr));
 	rc = lod_ost_pool_init(&new_pool->pool_rr.lqr_pool, 0);
 	if (rc)
 		GOTO(out_free_pool_obds, rc);
@@ -547,7 +549,7 @@ int lod_pool_add(struct obd_device *obd, char *poolname, char *ostname)
 	obd_str2uuid(&ost_uuid, ostname);
 
 	/* search ost in lod array */
-	lod_getref(lod);
+	lod_getref(&lod->lod_ost_descs);
 	lod_foreach_ost(lod, idx) {
 		if (obd_uuid_equals(&ost_uuid, &OST_TGT(lod, idx)->ltd_uuid)) {
 			rc = 0;
@@ -569,7 +571,7 @@ int lod_pool_add(struct obd_device *obd, char *poolname, char *ostname)
 
 	EXIT;
 out:
-	lod_putref(lod);
+	lod_putref(lod, &lod->lod_ost_descs);
 	lod_pool_putref(pool);
 	return rc;
 }
@@ -589,7 +591,7 @@ int lod_pool_remove(struct obd_device *obd, char *poolname, char *ostname)
 
 	obd_str2uuid(&ost_uuid, ostname);
 
-	lod_getref(lod);
+	lod_getref(&lod->lod_ost_descs);
 	/* search ost in lod array, to get index */
 	cfs_foreach_bit(lod->lod_ost_bitmap, idx) {
 		if (obd_uuid_equals(&ost_uuid, &OST_TGT(lod, idx)->ltd_uuid)) {
@@ -611,7 +613,7 @@ int lod_pool_remove(struct obd_device *obd, char *poolname, char *ostname)
 
 	EXIT;
 out:
-	lod_putref(lod);
+	lod_putref(lod, &lod->lod_ost_descs);
 	lod_pool_putref(pool);
 	return rc;
 }