#include <lprocfs_status.h>
#include <libcfs/list.h>
#include <lustre_param.h>
-#include <class_hash.h>
-static lustre_hash_ops_t uuid_hash_ops;
-static lustre_hash_ops_t nid_hash_ops;
-static lustre_hash_ops_t nid_stat_hash_ops;
+static cfs_hash_ops_t uuid_hash_ops;
+static cfs_hash_ops_t nid_hash_ops;
+static cfs_hash_ops_t nid_stat_hash_ops;
/*********** string parsing utils *********/
LASSERTF(obd->obd_magic == OBD_DEVICE_MAGIC,
"obd %p obd_magic %08X != %08X\n",
obd, obd->obd_magic, OBD_DEVICE_MAGIC);
- LASSERTF(strncmp(obd->obd_name, name, strlen(name)) == 0, "%p obd_name %s != %s\n",
- obd, obd->obd_name, name);
+ LASSERTF(strncmp(obd->obd_name, name, strlen(name)) == 0,
+ "%p obd_name %s != %s\n", obd, obd->obd_name, name);
- rwlock_init(&obd->obd_pool_lock);
+ cfs_rwlock_init(&obd->obd_pool_lock);
obd->obd_pool_limit = 0;
obd->obd_pool_slv = 0;
CFS_INIT_LIST_HEAD(&obd->obd_exports);
+ CFS_INIT_LIST_HEAD(&obd->obd_unlinked_exports);
+ CFS_INIT_LIST_HEAD(&obd->obd_delayed_exports);
CFS_INIT_LIST_HEAD(&obd->obd_exports_timed);
CFS_INIT_LIST_HEAD(&obd->obd_nid_stats);
- spin_lock_init(&obd->obd_nid_lock);
- spin_lock_init(&obd->obd_dev_lock);
- sema_init(&obd->obd_dev_sem, 1);
- spin_lock_init(&obd->obd_osfs_lock);
+ cfs_spin_lock_init(&obd->obd_nid_lock);
+ cfs_spin_lock_init(&obd->obd_dev_lock);
+ cfs_sema_init(&obd->obd_dev_sem, 1);
+ cfs_spin_lock_init(&obd->obd_osfs_lock);
/* obd->obd_osfs_age must be set to a value in the distant
* past to guarantee a fresh statfs is fetched on mount. */
obd->obd_osfs_age = cfs_time_shift_64(-1000);
/* XXX belongs in setup not attach */
+ cfs_init_rwsem(&obd->obd_observer_link_sem);
/* recovery data */
cfs_init_timer(&obd->obd_recovery_timer);
- spin_lock_init(&obd->obd_processing_task_lock);
+ cfs_spin_lock_init(&obd->obd_processing_task_lock);
cfs_waitq_init(&obd->obd_next_transno_waitq);
cfs_waitq_init(&obd->obd_evict_inprogress_waitq);
CFS_INIT_LIST_HEAD(&obd->obd_req_replay_queue);
CFS_INIT_LIST_HEAD(&obd->obd_lock_replay_queue);
CFS_INIT_LIST_HEAD(&obd->obd_final_req_queue);
+ CFS_INIT_LIST_HEAD(&obd->obd_evict_list);
llog_group_init(&obd->obd_olg, FILTER_GROUP_LLOG);
- spin_lock_init(&obd->obd_uncommitted_replies_lock);
- CFS_INIT_LIST_HEAD(&obd->obd_uncommitted_replies);
-
len = strlen(uuid);
if (len >= sizeof(obd->obd_uuid)) {
CERROR("uuid must be < %d bytes long\n",
}
/* Detach drops this */
- spin_lock(&obd->obd_dev_lock);
- atomic_set(&obd->obd_refcount, 1);
- spin_unlock(&obd->obd_dev_lock);
+ cfs_spin_lock(&obd->obd_dev_lock);
+ cfs_atomic_set(&obd->obd_refcount, 1);
+ cfs_spin_unlock(&obd->obd_dev_lock);
lu_ref_init(&obd->obd_reference);
lu_ref_add(&obd->obd_reference, "attach", obd);
obd->obd_attached = 1;
CDEBUG(D_IOCTL, "OBD: dev %d attached type %s with refcount %d\n",
- obd->obd_minor, typename, atomic_read(&obd->obd_refcount));
+ obd->obd_minor, typename, cfs_atomic_read(&obd->obd_refcount));
RETURN(0);
out:
if (obd != NULL) {
}
/* is someone else setting us up right now? (attach inits spinlock) */
- spin_lock(&obd->obd_dev_lock);
+ cfs_spin_lock(&obd->obd_dev_lock);
if (obd->obd_starting) {
- spin_unlock(&obd->obd_dev_lock);
+ cfs_spin_unlock(&obd->obd_dev_lock);
CERROR("Device %d setup in progress (type %s)\n",
obd->obd_minor, obd->obd_type->typ_name);
RETURN(-EEXIST);
obd->obd_uuid_hash = NULL;
obd->obd_nid_hash = NULL;
obd->obd_nid_stats_hash = NULL;
- spin_unlock(&obd->obd_dev_lock);
+ cfs_spin_unlock(&obd->obd_dev_lock);
/* create an uuid-export lustre hash */
- obd->obd_uuid_hash = lustre_hash_init("UUID_HASH", 7, 7,
- &uuid_hash_ops, 0);
+ obd->obd_uuid_hash = cfs_hash_create("UUID_HASH",
+ HASH_UUID_CUR_BITS,
+ HASH_UUID_MAX_BITS,
+ &uuid_hash_ops, CFS_HASH_REHASH);
if (!obd->obd_uuid_hash)
GOTO(err_hash, err = -ENOMEM);
-
+
/* create a nid-export lustre hash */
- obd->obd_nid_hash = lustre_hash_init("NID_HASH", 7, 7,
- &nid_hash_ops, 0);
+ obd->obd_nid_hash = cfs_hash_create("NID_HASH",
+ HASH_NID_CUR_BITS,
+ HASH_NID_MAX_BITS,
+ &nid_hash_ops, CFS_HASH_REHASH);
if (!obd->obd_nid_hash)
GOTO(err_hash, err = -ENOMEM);
-
+
/* create a nid-stats lustre hash */
- obd->obd_nid_stats_hash = lustre_hash_init("NID_STATS", 7, 7,
- &nid_stat_hash_ops, 0);
+ obd->obd_nid_stats_hash = cfs_hash_create("NID_STATS",
+ HASH_NID_STATS_CUR_BITS,
+ HASH_NID_STATS_MAX_BITS,
+ &nid_stat_hash_ops, CFS_HASH_REHASH);
if (!obd->obd_nid_stats_hash)
GOTO(err_hash, err = -ENOMEM);
GOTO(err_hash, err = PTR_ERR(exp));
obd->obd_self_export = exp;
- list_del_init(&exp->exp_obd_chain_timed);
+ cfs_list_del_init(&exp->exp_obd_chain_timed);
class_export_put(exp);
err = obd_setup(obd, lcfg);
obd->obd_set_up = 1;
- spin_lock(&obd->obd_dev_lock);
+ cfs_spin_lock(&obd->obd_dev_lock);
/* cleanup drops this */
class_incref(obd, "setup", obd);
- spin_unlock(&obd->obd_dev_lock);
+ cfs_spin_unlock(&obd->obd_dev_lock);
CDEBUG(D_IOCTL, "finished setup of obd %s (uuid %s)\n",
obd->obd_name, obd->obd_uuid.uuid);
}
err_hash:
if (obd->obd_uuid_hash) {
- lustre_hash_exit(obd->obd_uuid_hash);
+ cfs_hash_destroy(obd->obd_uuid_hash);
obd->obd_uuid_hash = NULL;
}
if (obd->obd_nid_hash) {
- lustre_hash_exit(obd->obd_nid_hash);
+ cfs_hash_destroy(obd->obd_nid_hash);
obd->obd_nid_hash = NULL;
}
if (obd->obd_nid_stats_hash) {
- lustre_hash_exit(obd->obd_nid_stats_hash);
+ cfs_hash_destroy(obd->obd_nid_stats_hash);
obd->obd_nid_stats_hash = NULL;
}
obd->obd_starting = 0;
RETURN(-EBUSY);
}
- spin_lock(&obd->obd_dev_lock);
+ cfs_spin_lock(&obd->obd_dev_lock);
if (!obd->obd_attached) {
- spin_unlock(&obd->obd_dev_lock);
+ cfs_spin_unlock(&obd->obd_dev_lock);
CERROR("OBD device %d not attached\n", obd->obd_minor);
RETURN(-ENODEV);
}
obd->obd_attached = 0;
- spin_unlock(&obd->obd_dev_lock);
+ cfs_spin_unlock(&obd->obd_dev_lock);
CDEBUG(D_IOCTL, "detach on obd %s (uuid %s)\n",
obd->obd_name, obd->obd_uuid.uuid);
RETURN(0);
}
-static void dump_exports(struct obd_device *obd)
-{
- struct obd_export *exp;
-
- spin_lock(&obd->obd_dev_lock);
- list_for_each_entry(exp, &obd->obd_exports, exp_obd_chain) {
- struct ptlrpc_reply_state *rs;
- struct ptlrpc_reply_state *first_reply = NULL;
- int nreplies = 0;
-
- spin_lock(&exp->exp_lock);
- list_for_each_entry (rs, &exp->exp_outstanding_replies,
- rs_exp_list) {
- if (nreplies == 0)
- first_reply = rs;
- nreplies++;
- }
- spin_unlock(&exp->exp_lock);
-
- CDEBUG(D_IOCTL, "%s: %p %s %s %d %d %d: %p %s\n",
- obd->obd_name, exp, exp->exp_client_uuid.uuid,
- obd_export_nid2str(exp),
- atomic_read(&exp->exp_refcount),
- exp->exp_failed, nreplies, first_reply,
- nreplies > 3 ? "..." : "");
- }
- spin_unlock(&obd->obd_dev_lock);
-}
-
int class_cleanup(struct obd_device *obd, struct lustre_cfg *lcfg)
{
int err = 0;
RETURN(-ENODEV);
}
- spin_lock(&obd->obd_dev_lock);
+ cfs_spin_lock(&obd->obd_dev_lock);
if (obd->obd_stopping) {
- spin_unlock(&obd->obd_dev_lock);
+ cfs_spin_unlock(&obd->obd_dev_lock);
CERROR("OBD %d already stopping\n", obd->obd_minor);
RETURN(-ENODEV);
}
/* Leave this on forever */
obd->obd_stopping = 1;
- spin_unlock(&obd->obd_dev_lock);
-
+ cfs_spin_unlock(&obd->obd_dev_lock);
+
if (lcfg->lcfg_bufcount >= 2 && LUSTRE_CFG_BUFLEN(lcfg, 1) > 0) {
for (flag = lustre_cfg_string(lcfg, 1); *flag != 0; flag++)
switch (*flag) {
/* The three references that should be remaining are the
* obd_self_export and the attach and setup references. */
- if (atomic_read(&obd->obd_refcount) > 3) {
+ if (cfs_atomic_read(&obd->obd_refcount) > 3) {
/* refcounf - 3 might be the number of real exports
(excluding self export). But class_incref is called
by other things as well, so don't count on it. */
CDEBUG(D_IOCTL, "%s: forcing exports to disconnect: %d\n",
- obd->obd_name, atomic_read(&obd->obd_refcount) - 3);
- dump_exports(obd);
+ obd->obd_name, cfs_atomic_read(&obd->obd_refcount) - 3);
+ dump_exports(obd, 0);
class_disconnect_exports(obd);
}
/* destroy an uuid-export hash body */
if (obd->obd_uuid_hash) {
- lustre_hash_exit(obd->obd_uuid_hash);
+ cfs_hash_destroy(obd->obd_uuid_hash);
obd->obd_uuid_hash = NULL;
}
/* destroy a nid-export hash body */
if (obd->obd_nid_hash) {
- lustre_hash_exit(obd->obd_nid_hash);
+ cfs_hash_destroy(obd->obd_nid_hash);
obd->obd_nid_hash = NULL;
}
/* destroy a nid-stats hash body */
if (obd->obd_nid_stats_hash) {
- lustre_hash_exit(obd->obd_nid_stats_hash);
+ cfs_hash_destroy(obd->obd_nid_stats_hash);
obd->obd_nid_stats_hash = NULL;
}
const char *scope, const void *source)
{
lu_ref_add_atomic(&obd->obd_reference, scope, source);
- atomic_inc(&obd->obd_refcount);
+ cfs_atomic_inc(&obd->obd_refcount);
CDEBUG(D_INFO, "incref %s (%p) now %d\n", obd->obd_name, obd,
- atomic_read(&obd->obd_refcount));
+ cfs_atomic_read(&obd->obd_refcount));
return obd;
}
int err;
int refs;
- spin_lock(&obd->obd_dev_lock);
- atomic_dec(&obd->obd_refcount);
- refs = atomic_read(&obd->obd_refcount);
- spin_unlock(&obd->obd_dev_lock);
+ cfs_spin_lock(&obd->obd_dev_lock);
+ cfs_atomic_dec(&obd->obd_refcount);
+ refs = cfs_atomic_read(&obd->obd_refcount);
+ cfs_spin_unlock(&obd->obd_dev_lock);
lu_ref_del(&obd->obd_reference, scope, source);
CDEBUG(D_INFO, "Decref %s (%p) now %d\n", obd->obd_name, obd, refs);
/* All exports have been destroyed; there should
be no more in-progress ops by this point.*/
- spin_lock(&obd->obd_self_export->exp_lock);
- obd->obd_self_export->exp_flags |=
- (obd->obd_fail ? OBD_OPT_FAILOVER : 0) |
- (obd->obd_force ? OBD_OPT_FORCE : 0);
- spin_unlock(&obd->obd_self_export->exp_lock);
+ cfs_spin_lock(&obd->obd_self_export->exp_lock);
+ obd->obd_self_export->exp_flags |= exp_flags_from_obd(obd);
+ cfs_spin_unlock(&obd->obd_self_export->exp_lock);
/* note that we'll recurse into class_decref again */
class_unlink_export(obd->obd_self_export);
struct lustre_profile *lprof;
ENTRY;
- list_for_each_entry(lprof, &lustre_profile_list, lp_list) {
+ cfs_list_for_each_entry(lprof, &lustre_profile_list, lp_list) {
if (!strcmp(lprof->lp_profile, prof)) {
RETURN(lprof);
}
memcpy(lprof->lp_md, mdc, mdclen);
}
- list_add(&lprof->lp_list, &lustre_profile_list);
+ cfs_list_add(&lprof->lp_list, &lustre_profile_list);
RETURN(err);
out:
lprof = class_get_profile(prof);
if (lprof) {
- list_del(&lprof->lp_list);
+ cfs_list_del(&lprof->lp_list);
OBD_FREE(lprof->lp_profile, strlen(lprof->lp_profile) + 1);
OBD_FREE(lprof->lp_dt, strlen(lprof->lp_dt) + 1);
if (lprof->lp_md)
struct lustre_profile *lprof, *n;
ENTRY;
- list_for_each_entry_safe(lprof, n, &lustre_profile_list, lp_list) {
- list_del(&lprof->lp_list);
+ cfs_list_for_each_entry_safe(lprof, n, &lustre_profile_list, lp_list) {
+ cfs_list_del(&lprof->lp_list);
OBD_FREE(lprof->lp_profile, strlen(lprof->lp_profile) + 1);
OBD_FREE(lprof->lp_dt, strlen(lprof->lp_dt) + 1);
if (lprof->lp_md)
EXIT;
}
+static int class_set_global(char *ptr, int val) {
+ ENTRY;
+
+ if (class_match_param(ptr, PARAM_AT_MIN, NULL) == 0)
+ at_min = val;
+ else if (class_match_param(ptr, PARAM_AT_MAX, NULL) == 0)
+ at_max = val;
+ else if (class_match_param(ptr, PARAM_AT_EXTRA, NULL) == 0)
+ at_extra = val;
+ else if (class_match_param(ptr, PARAM_AT_EARLY_MARGIN, NULL) == 0)
+ at_early_margin = val;
+ else if (class_match_param(ptr, PARAM_AT_HISTORY, NULL) == 0)
+ at_history = val;
+ else
+ RETURN(-EINVAL);
+
+ CDEBUG(D_IOCTL, "global %s = %d\n", ptr, val);
+
+ RETURN(0);
+}
+
+
/* We can't call ll_process_config directly because it lives in a module that
must be loaded after this one. */
static int (*client_process_config)(struct lustre_cfg *lcfg) = NULL;
obd_timeout = max(lcfg->lcfg_num, 1U);
GOTO(out, err = 0);
}
+ case LCFG_SET_LDLM_TIMEOUT: {
+ CDEBUG(D_IOCTL, "changing lustre ldlm_timeout from %d to %d\n",
+ ldlm_timeout, lcfg->lcfg_num);
+ ldlm_timeout = max(lcfg->lcfg_num, 1U);
+ if (ldlm_timeout >= obd_timeout)
+ ldlm_timeout = max(obd_timeout / 3, 1U);
+
+ GOTO(out, err = 0);
+ }
case LCFG_SET_UPCALL: {
LCONSOLE_ERROR_MSG(0x15a, "recovery upcall is deprecated\n");
/* COMPAT_146 Don't fail on old configs */
GOTO(out, err = 0);
}
case LCFG_PARAM: {
+ char *tmp;
/* llite has no obd */
if ((class_match_param(lustre_cfg_string(lcfg, 1),
PARAM_LLITE, 0) == 0) &&
client_process_config) {
err = (*client_process_config)(lcfg);
GOTO(out, err);
+ } else if ((class_match_param(lustre_cfg_string(lcfg, 1),
+ PARAM_SYS, &tmp) == 0)) {
+ /* Global param settings */
+ err = class_set_global(tmp, lcfg->lcfg_num);
+ /* Note that since LCFG_PARAM is LCFG_REQUIRED, new
+ unknown globals would cause config to fail */
+ if (err)
+ CWARN("Ignoring unknown param %s\n", tmp);
+ GOTO(out, 0);
}
+
/* Fall through */
break;
}
sval = strchr(key, '=');
if (!sval || (*(sval + 1) == 0)) {
CERROR("Can't parse param %s (missing '=')\n", key);
- /* rc = -EINVAL; continue parsing other params */
+ /* rc = -EINVAL; continue parsing other params */
continue;
}
keylen = sval - key;
vallen, data);
set_fs(oldfs);
}
- if (rc < 0)
- CERROR("writing proc entry %s err %d\n",
- var->name, rc);
break;
}
j++;
RETURN(-ENOSYS);
CERROR("%s: unknown param %s\n",
(char *)lustre_cfg_string(lcfg, 0), key);
- /* rc = -EINVAL; continue parsing other params */
+ /* rc = -EINVAL; continue parsing other params */
skip++;
+ } else if (rc < 0) {
+ CERROR("writing proc entry %s err %d\n",
+ var->name, rc);
+ rc = 0;
} else {
LCONSOLE_INFO("%s.%.*s: set parameter %.*s=%s\n",
lustre_cfg_string(lcfg, 0),
{
char *typename = lustre_cfg_string(lcfg, 1);
char *index = lustre_cfg_string(lcfg, 2);
-
+
if ((lcfg->lcfg_command == LCFG_ATTACH && typename &&
strcmp(typename, "mds") == 0)) {
CWARN("For 1.8 interoperability, rename obd "
*/
static unsigned
-uuid_hash(lustre_hash_t *lh, void *key, unsigned mask)
+uuid_hash(cfs_hash_t *hs, void *key, unsigned mask)
{
- return lh_djb2_hash(((struct obd_uuid *)key)->uuid,
- sizeof(((struct obd_uuid *)key)->uuid), mask);
+ return cfs_hash_djb2_hash(((struct obd_uuid *)key)->uuid,
+ sizeof(((struct obd_uuid *)key)->uuid), mask);
}
static void *
-uuid_key(struct hlist_node *hnode)
+uuid_key(cfs_hlist_node_t *hnode)
{
struct obd_export *exp;
- exp = hlist_entry(hnode, struct obd_export, exp_uuid_hash);
+ exp = cfs_hlist_entry(hnode, struct obd_export, exp_uuid_hash);
RETURN(&exp->exp_client_uuid);
}
* state with this function
*/
static int
-uuid_compare(void *key, struct hlist_node *hnode)
+uuid_compare(void *key, cfs_hlist_node_t *hnode)
{
struct obd_export *exp;
LASSERT(key);
- exp = hlist_entry(hnode, struct obd_export, exp_uuid_hash);
+ exp = cfs_hlist_entry(hnode, struct obd_export, exp_uuid_hash);
RETURN(obd_uuid_equals((struct obd_uuid *)key,&exp->exp_client_uuid) &&
!exp->exp_failed);
}
static void *
-uuid_export_get(struct hlist_node *hnode)
+uuid_export_get(cfs_hlist_node_t *hnode)
{
struct obd_export *exp;
- exp = hlist_entry(hnode, struct obd_export, exp_uuid_hash);
+ exp = cfs_hlist_entry(hnode, struct obd_export, exp_uuid_hash);
class_export_get(exp);
RETURN(exp);
}
static void *
-uuid_export_put(struct hlist_node *hnode)
+uuid_export_put(cfs_hlist_node_t *hnode)
{
struct obd_export *exp;
- exp = hlist_entry(hnode, struct obd_export, exp_uuid_hash);
+ exp = cfs_hlist_entry(hnode, struct obd_export, exp_uuid_hash);
class_export_put(exp);
RETURN(exp);
}
-static lustre_hash_ops_t uuid_hash_ops = {
- .lh_hash = uuid_hash,
- .lh_key = uuid_key,
- .lh_compare = uuid_compare,
- .lh_get = uuid_export_get,
- .lh_put = uuid_export_put,
+static cfs_hash_ops_t uuid_hash_ops = {
+ .hs_hash = uuid_hash,
+ .hs_key = uuid_key,
+ .hs_compare = uuid_compare,
+ .hs_get = uuid_export_get,
+ .hs_put = uuid_export_put,
};
*/
static unsigned
-nid_hash(lustre_hash_t *lh, void *key, unsigned mask)
+nid_hash(cfs_hash_t *hs, void *key, unsigned mask)
{
- return lh_djb2_hash(key, sizeof(lnet_nid_t), mask);
+ return cfs_hash_djb2_hash(key, sizeof(lnet_nid_t), mask);
}
static void *
-nid_key(struct hlist_node *hnode)
+nid_key(cfs_hlist_node_t *hnode)
{
struct obd_export *exp;
- exp = hlist_entry(hnode, struct obd_export, exp_nid_hash);
+ exp = cfs_hlist_entry(hnode, struct obd_export, exp_nid_hash);
RETURN(&exp->exp_connection->c_peer.nid);
}
* state with this function
*/
static int
-nid_compare(void *key, struct hlist_node *hnode)
+nid_compare(void *key, cfs_hlist_node_t *hnode)
{
struct obd_export *exp;
LASSERT(key);
- exp = hlist_entry(hnode, struct obd_export, exp_nid_hash);
+ exp = cfs_hlist_entry(hnode, struct obd_export, exp_nid_hash);
RETURN(exp->exp_connection->c_peer.nid == *(lnet_nid_t *)key &&
!exp->exp_failed);
}
static void *
-nid_export_get(struct hlist_node *hnode)
+nid_export_get(cfs_hlist_node_t *hnode)
{
struct obd_export *exp;
- exp = hlist_entry(hnode, struct obd_export, exp_nid_hash);
+ exp = cfs_hlist_entry(hnode, struct obd_export, exp_nid_hash);
class_export_get(exp);
RETURN(exp);
}
static void *
-nid_export_put(struct hlist_node *hnode)
+nid_export_put(cfs_hlist_node_t *hnode)
{
struct obd_export *exp;
- exp = hlist_entry(hnode, struct obd_export, exp_nid_hash);
+ exp = cfs_hlist_entry(hnode, struct obd_export, exp_nid_hash);
class_export_put(exp);
RETURN(exp);
}
-static lustre_hash_ops_t nid_hash_ops = {
- .lh_hash = nid_hash,
- .lh_key = nid_key,
- .lh_compare = nid_compare,
- .lh_get = nid_export_get,
- .lh_put = nid_export_put,
+static cfs_hash_ops_t nid_hash_ops = {
+ .hs_hash = nid_hash,
+ .hs_key = nid_key,
+ .hs_compare = nid_compare,
+ .hs_get = nid_export_get,
+ .hs_put = nid_export_put,
};
*/
static void *
-nidstats_key(struct hlist_node *hnode)
+nidstats_key(cfs_hlist_node_t *hnode)
{
struct nid_stat *ns;
- ns = hlist_entry(hnode, struct nid_stat, nid_hash);
+ ns = cfs_hlist_entry(hnode, struct nid_stat, nid_hash);
RETURN(&ns->nid);
}
static int
-nidstats_compare(void *key, struct hlist_node *hnode)
+nidstats_compare(void *key, cfs_hlist_node_t *hnode)
{
RETURN(*(lnet_nid_t *)nidstats_key(hnode) == *(lnet_nid_t *)key);
}
static void *
-nidstats_get(struct hlist_node *hnode)
+nidstats_get(cfs_hlist_node_t *hnode)
{
struct nid_stat *ns;
- ns = hlist_entry(hnode, struct nid_stat, nid_hash);
- ns->nid_exp_ref_count++;
+ ns = cfs_hlist_entry(hnode, struct nid_stat, nid_hash);
+ nidstat_getref(ns);
RETURN(ns);
}
static void *
-nidstats_put(struct hlist_node *hnode)
+nidstats_put(cfs_hlist_node_t *hnode)
{
struct nid_stat *ns;
- ns = hlist_entry(hnode, struct nid_stat, nid_hash);
- ns->nid_exp_ref_count--;
+ ns = cfs_hlist_entry(hnode, struct nid_stat, nid_hash);
+ nidstat_putref(ns);
RETURN(ns);
}
-static lustre_hash_ops_t nid_stat_hash_ops = {
- .lh_hash = nid_hash,
- .lh_key = nidstats_key,
- .lh_compare = nidstats_compare,
- .lh_get = nidstats_get,
- .lh_put = nidstats_put,
+static cfs_hash_ops_t nid_stat_hash_ops = {
+ .hs_hash = nid_hash,
+ .hs_key = nidstats_key,
+ .hs_compare = nidstats_compare,
+ .hs_get = nidstats_get,
+ .hs_put = nidstats_put,
};
git://git.whamcloud.com / fs / lustre-release.git / blobdiff