/*
* 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/
/* iterate to find a non empty entry */
prev_idx = iter->idx;
- cfs_down_read(&pool_tgt_rw_sem(iter->pool));
+ down_read(&pool_tgt_rw_sem(iter->pool));
iter->idx++;
if (iter->idx == pool_tgt_count(iter->pool)) {
iter->idx = prev_idx; /* we stay on the last entry */
- cfs_up_read(&pool_tgt_rw_sem(iter->pool));
+ up_read(&pool_tgt_rw_sem(iter->pool));
return NULL;
}
- cfs_up_read(&pool_tgt_rw_sem(iter->pool));
+ up_read(&pool_tgt_rw_sem(iter->pool));
(*pos)++;
/* return != NULL to continue */
return iter;
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);
LASSERT(iter->idx <= pool_tgt_count(iter->pool));
- cfs_down_read(&pool_tgt_rw_sem(iter->pool));
+ down_read(&pool_tgt_rw_sem(iter->pool));
osc_desc = pool_tgt(iter->pool, iter->idx);
- cfs_up_read(&pool_tgt_rw_sem(iter->pool));
+ up_read(&pool_tgt_rw_sem(iter->pool));
if (osc_desc)
seq_printf(s, "%s\n", obd_uuid2str(&(osc_desc->ltd_uuid)));
CDEBUG(level, "pool "LOV_POOLNAMEF" has %d members\n",
pool->pool_name, pool->pool_obds.op_count);
- cfs_down_read(&pool_tgt_rw_sem(pool));
+ down_read(&pool_tgt_rw_sem(pool));
for (i = 0; i < pool_tgt_count(pool) ; i++) {
if (!pool_tgt(pool, i) || !(pool_tgt(pool, i))->ltd_exp)
obd_uuid2str(&((pool_tgt(pool, i))->ltd_uuid)));
}
- cfs_up_read(&pool_tgt_rw_sem(pool));
+ up_read(&pool_tgt_rw_sem(pool));
lod_pool_putref(pool);
}
count = LOD_POOL_INIT_COUNT;
op->op_array = NULL;
op->op_count = 0;
- cfs_init_rwsem(&op->op_rw_sem);
+ init_rwsem(&op->op_rw_sem);
op->op_size = count;
OBD_ALLOC(op->op_array, op->op_size * sizeof(op->op_array[0]));
if (op->op_array == NULL) {
int rc = 0, i;
ENTRY;
- cfs_down_write(&op->op_rw_sem);
+ down_write(&op->op_rw_sem);
rc = lod_ost_pool_extend(op, min_count);
if (rc)
op->op_count++;
EXIT;
out:
- cfs_up_write(&op->op_rw_sem);
+ up_write(&op->op_rw_sem);
return rc;
}
int i;
ENTRY;
- cfs_down_write(&op->op_rw_sem);
+ down_write(&op->op_rw_sem);
for (i = 0; i < op->op_count; i++) {
if (op->op_array[i] == idx) {
memmove(&op->op_array[i], &op->op_array[i + 1],
(op->op_count - i - 1) * sizeof(op->op_array[0]));
op->op_count--;
- cfs_up_write(&op->op_rw_sem);
+ up_write(&op->op_rw_sem);
EXIT;
return 0;
}
}
- cfs_up_write(&op->op_rw_sem);
+ up_write(&op->op_rw_sem);
RETURN(-EINVAL);
}
if (op->op_size == 0)
RETURN(0);
- cfs_down_write(&op->op_rw_sem);
+ down_write(&op->op_rw_sem);
OBD_FREE(op->op_array, op->op_size * sizeof(op->op_array[0]));
op->op_array = NULL;
op->op_count = 0;
op->op_size = 0;
- cfs_up_write(&op->op_rw_sem);
+ up_write(&op->op_rw_sem);
RETURN(0);
}
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);
CDEBUG(D_INFO, "pool %p - proc %p\n", new_pool, new_pool->pool_proc_entry);
#endif
- cfs_spin_lock(&obd->obd_dev_lock);
+ spin_lock(&obd->obd_dev_lock);
cfs_list_add_tail(&new_pool->pool_list, &lod->lod_pool_list);
lod->lod_pool_count++;
- cfs_spin_unlock(&obd->obd_dev_lock);
+ spin_unlock(&obd->obd_dev_lock);
/* add to find only when it fully ready */
rc = cfs_hash_add_unique(lod->lod_pools_hash_body, poolname,
RETURN(0);
out_err:
- cfs_spin_lock(&obd->obd_dev_lock);
+ spin_lock(&obd->obd_dev_lock);
cfs_list_del_init(&new_pool->pool_list);
lod->lod_pool_count--;
- cfs_spin_unlock(&obd->obd_dev_lock);
+ spin_unlock(&obd->obd_dev_lock);
lprocfs_remove(&new_pool->pool_proc_entry);
lod_pool_putref(pool);
}
- cfs_spin_lock(&obd->obd_dev_lock);
+ spin_lock(&obd->obd_dev_lock);
cfs_list_del_init(&pool->pool_list);
lod->lod_pool_count--;
- cfs_spin_unlock(&obd->obd_dev_lock);
+ spin_unlock(&obd->obd_dev_lock);
/* release last reference */
lod_pool_putref(pool);
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;
EXIT;
out:
- lod_putref(lod);
+ lod_putref(lod, &lod->lod_ost_descs);
lod_pool_putref(pool);
return rc;
}
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)) {
EXIT;
out:
- lod_putref(lod);
+ lod_putref(lod, &lod->lod_ost_descs);
lod_pool_putref(pool);
return rc;
}
*/
lod_pool_getref(pool);
- cfs_down_read(&pool_tgt_rw_sem(pool));
+ down_read(&pool_tgt_rw_sem(pool));
for (i = 0; i < pool_tgt_count(pool); i++) {
if (pool_tgt_array(pool)[i] == idx)
rc = -ENOENT;
EXIT;
out:
- cfs_up_read(&pool_tgt_rw_sem(pool));
+ up_read(&pool_tgt_rw_sem(pool));
lod_pool_putref(pool);
return rc;