* GPL HEADER END
*/
/*
- * Copyright 2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
*/
/*
static void lov_pool_getref(struct pool_desc *pool)
{
CDEBUG(D_INFO, "pool %p\n", pool);
- atomic_inc(&pool->pool_refcount);
+ cfs_atomic_inc(&pool->pool_refcount);
}
void lov_pool_putref(struct pool_desc *pool)
{
CDEBUG(D_INFO, "pool %p\n", pool);
- if (atomic_dec_and_test(&pool->pool_refcount)) {
- LASSERT(hlist_unhashed(&pool->pool_hash));
- LASSERT(list_empty(&pool->pool_list));
+ if (cfs_atomic_dec_and_test(&pool->pool_refcount)) {
+ LASSERT(cfs_hlist_unhashed(&pool->pool_hash));
+ LASSERT(cfs_list_empty(&pool->pool_list));
LASSERT(pool->pool_proc_entry == NULL);
lov_ost_pool_free(&(pool->pool_rr.lqr_pool));
lov_ost_pool_free(&(pool->pool_obds));
}
}
+void lov_pool_putref_locked(struct pool_desc *pool)
+{
+ CDEBUG(D_INFO, "pool %p\n", pool);
+ LASSERT(cfs_atomic_read(&pool->pool_refcount) > 1);
+
+ cfs_atomic_dec(&pool->pool_refcount);
+}
/*
* hash function using a Rotating Hash algorithm
* Chapter 6.4.
* Addison Wesley, 1973
*/
-static __u32 pool_hashfn(lustre_hash_t *hash_body, void *key, unsigned mask)
+static __u32 pool_hashfn(cfs_hash_t *hash_body, const void *key, unsigned mask)
{
int i;
__u32 result;
return (result % mask);
}
-static void *pool_key(struct hlist_node *hnode)
+static void *pool_key(cfs_hlist_node_t *hnode)
{
struct pool_desc *pool;
- pool = hlist_entry(hnode, struct pool_desc, pool_hash);
+ pool = cfs_hlist_entry(hnode, struct pool_desc, pool_hash);
return (pool->pool_name);
}
-static int pool_hashkey_compare(void *key, struct hlist_node *compared_hnode)
+static int pool_hashkey_keycmp(const void *key, cfs_hlist_node_t *compared_hnode)
{
char *pool_name;
struct pool_desc *pool;
- int rc;
pool_name = (char *)key;
- pool = hlist_entry(compared_hnode, struct pool_desc, pool_hash);
- rc = strncmp(pool_name, pool->pool_name, LOV_MAXPOOLNAME);
- return (!rc);
+ pool = cfs_hlist_entry(compared_hnode, struct pool_desc, pool_hash);
+ return !strncmp(pool_name, pool->pool_name, LOV_MAXPOOLNAME);
}
-static void *pool_hashrefcount_get(struct hlist_node *hnode)
+static void *pool_hashobject(cfs_hlist_node_t *hnode)
+{
+ return cfs_hlist_entry(hnode, struct pool_desc, pool_hash);
+}
+
+static void pool_hashrefcount_get(cfs_hash_t *hs, cfs_hlist_node_t *hnode)
{
struct pool_desc *pool;
- pool = hlist_entry(hnode, struct pool_desc, pool_hash);
+ pool = cfs_hlist_entry(hnode, struct pool_desc, pool_hash);
lov_pool_getref(pool);
- return (pool);
}
-static void *pool_hashrefcount_put(struct hlist_node *hnode)
+static void pool_hashrefcount_put_locked(cfs_hash_t *hs,
+ cfs_hlist_node_t *hnode)
{
struct pool_desc *pool;
- pool = hlist_entry(hnode, struct pool_desc, pool_hash);
- lov_pool_putref(pool);
- return (pool);
+ pool = cfs_hlist_entry(hnode, struct pool_desc, pool_hash);
+ lov_pool_putref_locked(pool);
}
-lustre_hash_ops_t pool_hash_operations = {
- .lh_hash = pool_hashfn,
- .lh_key = pool_key,
- .lh_compare = pool_hashkey_compare,
- .lh_get = pool_hashrefcount_get,
- .lh_put = pool_hashrefcount_put,
+cfs_hash_ops_t pool_hash_operations = {
+ .hs_hash = pool_hashfn,
+ .hs_key = pool_key,
+ .hs_keycmp = pool_hashkey_keycmp,
+ .hs_object = pool_hashobject,
+ .hs_get = pool_hashrefcount_get,
+ .hs_put_locked = pool_hashrefcount_put_locked,
+
};
#ifdef LPROCFS
/* iterate to find a non empty entry */
prev_idx = iter->idx;
- down_read(&pool_tgt_rw_sem(iter->pool));
+ cfs_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 */
- up_read(&pool_tgt_rw_sem(iter->pool));
+ cfs_up_read(&pool_tgt_rw_sem(iter->pool));
return NULL;
}
- up_read(&pool_tgt_rw_sem(iter->pool));
+ cfs_up_read(&pool_tgt_rw_sem(iter->pool));
(*pos)++;
/* return != NULL to continue */
return iter;
LASSERT(iter->pool != NULL);
LASSERT(iter->idx <= pool_tgt_count(iter->pool));
- down_read(&pool_tgt_rw_sem(iter->pool));
+ cfs_down_read(&pool_tgt_rw_sem(iter->pool));
tgt = pool_tgt(iter->pool, iter->idx);
- up_read(&pool_tgt_rw_sem(iter->pool));
+ cfs_up_read(&pool_tgt_rw_sem(iter->pool));
if (tgt)
seq_printf(s, "%s\n", obd_uuid2str(&(tgt->ltd_uuid)));
CDEBUG(level, "pool "LOV_POOLNAMEF" has %d members\n",
pool->pool_name, pool->pool_obds.op_count);
- down_read(&pool_tgt_rw_sem(pool));
+ cfs_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)));
}
- up_read(&pool_tgt_rw_sem(pool));
+ cfs_up_read(&pool_tgt_rw_sem(pool));
lov_pool_putref(pool);
}
count = LOV_POOL_INIT_COUNT;
op->op_array = NULL;
op->op_count = 0;
- init_rwsem(&op->op_rw_sem);
+ cfs_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;
- down_write(&op->op_rw_sem);
+ cfs_down_write(&op->op_rw_sem);
rc = lov_ost_pool_extend(op, min_count);
if (rc)
op->op_count++;
EXIT;
out:
- up_write(&op->op_rw_sem);
+ cfs_up_write(&op->op_rw_sem);
return rc;
}
int i;
ENTRY;
- down_write(&op->op_rw_sem);
+ cfs_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--;
- up_write(&op->op_rw_sem);
+ cfs_up_write(&op->op_rw_sem);
EXIT;
return 0;
}
}
- up_write(&op->op_rw_sem);
+ cfs_up_write(&op->op_rw_sem);
RETURN(-EINVAL);
}
if (op->op_size == 0)
RETURN(0);
- down_write(&op->op_rw_sem);
+ cfs_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;
- up_write(&op->op_rw_sem);
+ cfs_up_write(&op->op_rw_sem);
RETURN(0);
}
/* ref count init to 1 because when created a pool is always used
* up to deletion
*/
- atomic_set(&new_pool->pool_refcount, 1);
+ cfs_atomic_set(&new_pool->pool_refcount, 1);
rc = lov_ost_pool_init(&new_pool->pool_obds, 0);
if (rc)
GOTO(out_err, rc);
if (rc)
GOTO(out_free_pool_obds, rc);
- INIT_HLIST_NODE(&new_pool->pool_hash);
+ CFS_INIT_HLIST_NODE(&new_pool->pool_hash);
#ifdef LPROCFS
/* we need this assert seq_file is not implementated for liblustre */
CDEBUG(D_INFO, "pool %p - proc %p\n", new_pool, new_pool->pool_proc_entry);
#endif
- spin_lock(&obd->obd_dev_lock);
- list_add_tail(&new_pool->pool_list, &lov->lov_pool_list);
+ cfs_spin_lock(&obd->obd_dev_lock);
+ cfs_list_add_tail(&new_pool->pool_list, &lov->lov_pool_list);
lov->lov_pool_count++;
- spin_unlock(&obd->obd_dev_lock);
+ cfs_spin_unlock(&obd->obd_dev_lock);
/* add to find only when it fully ready */
- rc = lustre_hash_add_unique(lov->lov_pools_hash_body, poolname,
- &new_pool->pool_hash);
+ rc = cfs_hash_add_unique(lov->lov_pools_hash_body, poolname,
+ &new_pool->pool_hash);
if (rc)
GOTO(out_err, rc = -EEXIST);
RETURN(0);
out_err:
- spin_lock(&obd->obd_dev_lock);
- list_del_init(&new_pool->pool_list);
+ cfs_spin_lock(&obd->obd_dev_lock);
+ cfs_list_del_init(&new_pool->pool_list);
lov->lov_pool_count--;
- spin_unlock(&obd->obd_dev_lock);
+ cfs_spin_unlock(&obd->obd_dev_lock);
lprocfs_remove(&new_pool->pool_proc_entry);
lov = &(obd->u.lov);
/* lookup and kill hash reference */
- pool = lustre_hash_del_key(lov->lov_pools_hash_body, poolname);
+ pool = cfs_hash_del_key(lov->lov_pools_hash_body, poolname);
if (pool == NULL)
RETURN(-ENOENT);
lov_pool_putref(pool);
}
- spin_lock(&obd->obd_dev_lock);
- list_del_init(&pool->pool_list);
+ cfs_spin_lock(&obd->obd_dev_lock);
+ cfs_list_del_init(&pool->pool_list);
lov->lov_pool_count--;
- spin_unlock(&obd->obd_dev_lock);
+ cfs_spin_unlock(&obd->obd_dev_lock);
/* release last reference */
lov_pool_putref(pool);
lov = &(obd->u.lov);
- pool = lustre_hash_lookup(lov->lov_pools_hash_body, poolname);
+ pool = cfs_hash_lookup(lov->lov_pools_hash_body, poolname);
if (pool == NULL)
RETURN(-ENOENT);
/* search ost in lov array */
- lov_getref(obd);
+ obd_getref(obd);
for (lov_idx = 0; lov_idx < lov->desc.ld_tgt_count; lov_idx++) {
if (!lov->lov_tgts[lov_idx])
continue;
EXIT;
out:
- lov_putref(obd);
+ obd_putref(obd);
lov_pool_putref(pool);
return rc;
}
lov = &(obd->u.lov);
- pool = lustre_hash_lookup(lov->lov_pools_hash_body, poolname);
+ pool = cfs_hash_lookup(lov->lov_pools_hash_body, poolname);
if (pool == NULL)
RETURN(-ENOENT);
obd_str2uuid(&ost_uuid, ostname);
- lov_getref(obd);
+ obd_getref(obd);
/* search ost in lov array, to get index */
for (lov_idx = 0; lov_idx < lov->desc.ld_tgt_count; lov_idx++) {
if (!lov->lov_tgts[lov_idx])
EXIT;
out:
- lov_putref(obd);
+ obd_putref(obd);
lov_pool_putref(pool);
return rc;
}
*/
lov_pool_getref(pool);
- down_read(&pool_tgt_rw_sem(pool));
+ cfs_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:
- up_read(&pool_tgt_rw_sem(pool));
+ cfs_up_read(&pool_tgt_rw_sem(pool));
lov_pool_putref(pool);
return rc;
pool = NULL;
if (poolname[0] != '\0') {
- pool = lustre_hash_lookup(lov->lov_pools_hash_body, poolname);
+ pool = cfs_hash_lookup(lov->lov_pools_hash_body, poolname);
if (pool == NULL)
CWARN("Request for an unknown pool ("LOV_POOLNAMEF")\n",
poolname);
git://git.whamcloud.com / fs / lustre-release.git / blobdiff