X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fobdclass%2Fcl_object.c;h=574ed6801801d8444e0933558bebe11f0785709b;hb=58f3eb928f563f24f0b3ee41970fa23a59fdcb87;hp=7ca27c6e9cf6581831a7d4283472c65ef427b0ab;hpb=05a8aa6216160b7c00d2b9cdfda89f35c5489901;p=fs%2Flustre-release.git diff --git a/lustre/obdclass/cl_object.c b/lustre/obdclass/cl_object.c index 7ca27c6..574ed68 100644 --- a/lustre/obdclass/cl_object.c +++ b/lustre/obdclass/cl_object.c @@ -26,7 +26,7 @@ * 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. */ /* @@ -60,7 +60,7 @@ #include #include #include -#include /* for lustre_hash stuff */ +#include /* for cfs_hash stuff */ /* lu_time_global_{init,fini}() */ #include @@ -70,11 +70,11 @@ static cfs_mem_cache_t *cl_env_kmem; /** Lock class of cl_object_header::coh_page_guard */ -static struct lock_class_key cl_page_guard_class; +static cfs_lock_class_key_t cl_page_guard_class; /** Lock class of cl_object_header::coh_lock_guard */ -static struct lock_class_key cl_lock_guard_class; +static cfs_lock_class_key_t cl_lock_guard_class; /** Lock class of cl_object_header::coh_attr_guard */ -static struct lock_class_key cl_attr_guard_class; +static cfs_lock_class_key_t cl_attr_guard_class; /** * Initialize cl_object_header. @@ -86,12 +86,12 @@ int cl_object_header_init(struct cl_object_header *h) ENTRY; result = lu_object_header_init(&h->coh_lu); if (result == 0) { - spin_lock_init(&h->coh_page_guard); - spin_lock_init(&h->coh_lock_guard); - spin_lock_init(&h->coh_attr_guard); - lockdep_set_class(&h->coh_attr_guard, &cl_page_guard_class); - lockdep_set_class(&h->coh_attr_guard, &cl_lock_guard_class); - lockdep_set_class(&h->coh_attr_guard, &cl_attr_guard_class); + cfs_spin_lock_init(&h->coh_page_guard); + cfs_spin_lock_init(&h->coh_lock_guard); + cfs_spin_lock_init(&h->coh_attr_guard); + cfs_lockdep_set_class(&h->coh_attr_guard, &cl_page_guard_class); + cfs_lockdep_set_class(&h->coh_attr_guard, &cl_lock_guard_class); + cfs_lockdep_set_class(&h->coh_attr_guard, &cl_attr_guard_class); h->coh_pages = 0; /* XXX hard coded GFP_* mask. */ INIT_RADIX_TREE(&h->coh_tree, GFP_ATOMIC); @@ -106,7 +106,7 @@ EXPORT_SYMBOL(cl_object_header_init); */ void cl_object_header_fini(struct cl_object_header *h) { - LASSERT(list_empty(&h->coh_locks)); + LASSERT(cfs_list_empty(&h->coh_locks)); lu_object_header_fini(&h->coh_lu); } EXPORT_SYMBOL(cl_object_header_fini); @@ -123,7 +123,7 @@ struct cl_object *cl_object_find(const struct lu_env *env, struct cl_device *cd, const struct lu_fid *fid, const struct cl_object_conf *c) { - might_sleep(); + cfs_might_sleep(); return lu2cl(lu_object_find_slice(env, cl2lu_dev(cd), fid, &c->coc_lu)); } EXPORT_SYMBOL(cl_object_find); @@ -184,7 +184,7 @@ EXPORT_SYMBOL(cl_object_top); * * \see cl_attr, cl_object_attr_lock(), cl_object_operations::coo_attr_get(). */ -static spinlock_t *cl_object_attr_guard(struct cl_object *o) +static cfs_spinlock_t *cl_object_attr_guard(struct cl_object *o) { return &cl_object_header(cl_object_top(o))->coh_attr_guard; } @@ -198,7 +198,7 @@ static spinlock_t *cl_object_attr_guard(struct cl_object *o) */ void cl_object_attr_lock(struct cl_object *o) { - spin_lock(cl_object_attr_guard(o)); + cfs_spin_lock(cl_object_attr_guard(o)); } EXPORT_SYMBOL(cl_object_attr_lock); @@ -207,7 +207,7 @@ EXPORT_SYMBOL(cl_object_attr_lock); */ void cl_object_attr_unlock(struct cl_object *o) { - spin_unlock(cl_object_attr_guard(o)); + cfs_spin_unlock(cl_object_attr_guard(o)); } EXPORT_SYMBOL(cl_object_attr_unlock); @@ -229,7 +229,7 @@ int cl_object_attr_get(const struct lu_env *env, struct cl_object *obj, top = obj->co_lu.lo_header; result = 0; - list_for_each_entry(obj, &top->loh_layers, co_lu.lo_linkage) { + cfs_list_for_each_entry(obj, &top->loh_layers, co_lu.lo_linkage) { if (obj->co_ops->coo_attr_get != NULL) { result = obj->co_ops->coo_attr_get(env, obj, attr); if (result != 0) { @@ -261,7 +261,8 @@ int cl_object_attr_set(const struct lu_env *env, struct cl_object *obj, top = obj->co_lu.lo_header; result = 0; - list_for_each_entry_reverse(obj, &top->loh_layers, co_lu.lo_linkage) { + cfs_list_for_each_entry_reverse(obj, &top->loh_layers, + co_lu.lo_linkage) { if (obj->co_ops->coo_attr_set != NULL) { result = obj->co_ops->coo_attr_set(env, obj, attr, v); if (result != 0) { @@ -292,7 +293,8 @@ int cl_object_glimpse(const struct lu_env *env, struct cl_object *obj, ENTRY; top = obj->co_lu.lo_header; result = 0; - list_for_each_entry_reverse(obj, &top->loh_layers, co_lu.lo_linkage) { + cfs_list_for_each_entry_reverse(obj, &top->loh_layers, + co_lu.lo_linkage) { if (obj->co_ops->coo_glimpse != NULL) { result = obj->co_ops->coo_glimpse(env, obj, lvb); if (result != 0) @@ -320,7 +322,7 @@ int cl_conf_set(const struct lu_env *env, struct cl_object *obj, ENTRY; top = obj->co_lu.lo_header; result = 0; - list_for_each_entry(obj, &top->loh_layers, co_lu.lo_linkage) { + cfs_list_for_each_entry(obj, &top->loh_layers, co_lu.lo_linkage) { if (obj->co_ops->coo_conf_set != NULL) { result = obj->co_ops->coo_conf_set(env, obj, conf); if (result != 0) @@ -346,7 +348,7 @@ void cl_object_kill(const struct lu_env *env, struct cl_object *obj) LASSERT(hdr->coh_tree.rnode == NULL); LASSERT(hdr->coh_pages == 0); - set_bit(LU_OBJECT_HEARD_BANSHEE, &hdr->coh_lu.loh_flags); + cfs_set_bit(LU_OBJECT_HEARD_BANSHEE, &hdr->coh_lu.loh_flags); /* * Destroy all locks. Object destruction (including cl_inode_fini()) * cannot cancel the locks, because in the case of a local client, @@ -378,9 +380,9 @@ int cl_object_has_locks(struct cl_object *obj) struct cl_object_header *head = cl_object_header(obj); int has; - spin_lock(&head->coh_lock_guard); - has = list_empty(&head->coh_locks); - spin_unlock(&head->coh_lock_guard); + cfs_spin_lock(&head->coh_lock_guard); + has = cfs_list_empty(&head->coh_locks); + cfs_spin_unlock(&head->coh_lock_guard); return (has == 0); } @@ -389,10 +391,10 @@ EXPORT_SYMBOL(cl_object_has_locks); void cache_stats_init(struct cache_stats *cs, const char *name) { cs->cs_name = name; - atomic_set(&cs->cs_lookup, 0); - atomic_set(&cs->cs_hit, 0); - atomic_set(&cs->cs_total, 0); - atomic_set(&cs->cs_busy, 0); + cfs_atomic_set(&cs->cs_lookup, 0); + cfs_atomic_set(&cs->cs_hit, 0); + cfs_atomic_set(&cs->cs_total, 0); + cfs_atomic_set(&cs->cs_busy, 0); } int cache_stats_print(const struct cache_stats *cs, @@ -410,11 +412,11 @@ int cache_stats_print(const struct cache_stats *cs, nob += snprintf(page + nob, count - nob, "%5.5s: %6u %6u %6u %6u %6u", cs->cs_name, - atomic_read(&cs->cs_lookup), - atomic_read(&cs->cs_hit), - atomic_read(&cs->cs_total), - atomic_read(&cs->cs_busy), - atomic_read(&cs->cs_created)); + cfs_atomic_read(&cs->cs_lookup), + cfs_atomic_read(&cs->cs_hit), + cfs_atomic_read(&cs->cs_total), + cfs_atomic_read(&cs->cs_busy), + cfs_atomic_read(&cs->cs_created)); return nob; } @@ -434,9 +436,9 @@ int cl_site_init(struct cl_site *s, struct cl_device *d) cache_stats_init(&s->cs_pages, "pages"); cache_stats_init(&s->cs_locks, "locks"); for (i = 0; i < ARRAY_SIZE(s->cs_pages_state); ++i) - atomic_set(&s->cs_pages_state[0], 0); + cfs_atomic_set(&s->cs_pages_state[0], 0); for (i = 0; i < ARRAY_SIZE(s->cs_locks_state); ++i) - atomic_set(&s->cs_locks_state[i], 0); + cfs_atomic_set(&s->cs_locks_state[i], 0); } return result; } @@ -453,11 +455,11 @@ EXPORT_SYMBOL(cl_site_fini); static struct cache_stats cl_env_stats = { .cs_name = "envs", - .cs_created = ATOMIC_INIT(0), - .cs_lookup = ATOMIC_INIT(0), - .cs_hit = ATOMIC_INIT(0), - .cs_total = ATOMIC_INIT(0), - .cs_busy = ATOMIC_INIT(0) + .cs_created = CFS_ATOMIC_INIT(0), + .cs_lookup = CFS_ATOMIC_INIT(0), + .cs_hit = CFS_ATOMIC_INIT(0), + .cs_total = CFS_ATOMIC_INIT(0), + .cs_busy = CFS_ATOMIC_INIT(0) }; /** @@ -480,7 +482,7 @@ int cl_site_stats_print(const struct cl_site *site, char *page, int count) [CLS_QUEUING] = "q", [CLS_ENQUEUED] = "e", [CLS_HELD] = "h", - [CLS_UNLOCKING] = "u", + [CLS_INTRANSIT] = "t", [CLS_CACHED] = "c", [CLS_FREEING] = "f" }; @@ -496,14 +498,14 @@ locks: ...... ...... ...... ...... ...... [...... ...... ...... ...... ......] for (i = 0; i < ARRAY_SIZE(site->cs_pages_state); ++i) nob += snprintf(page + nob, count - nob, "%s: %u ", pstate[i], - atomic_read(&site->cs_pages_state[i])); + cfs_atomic_read(&site->cs_pages_state[i])); nob += snprintf(page + nob, count - nob, "]\n"); nob += cache_stats_print(&site->cs_locks, page + nob, count - nob, 0); nob += snprintf(page + nob, count - nob, " ["); for (i = 0; i < ARRAY_SIZE(site->cs_locks_state); ++i) nob += snprintf(page + nob, count - nob, "%s: %u ", lstate[i], - atomic_read(&site->cs_locks_state[i])); + cfs_atomic_read(&site->cs_locks_state[i])); nob += snprintf(page + nob, count - nob, "]\n"); nob += cache_stats_print(&cl_env_stats, page + nob, count - nob, 0); nob += snprintf(page + nob, count - nob, "\n"); @@ -517,31 +519,62 @@ EXPORT_SYMBOL(cl_site_stats_print); * */ +/** + * The most efficient way is to store cl_env pointer in task specific + * structures. On Linux, it wont' be easy to use task_struct->journal_info + * because Lustre code may call into other fs which has certain assumptions + * about journal_info. Currently following fields in task_struct are identified + * can be used for this purpose: + * - cl_env: for liblustre. + * - tux_info: ony on RedHat kernel. + * - ... + * \note As long as we use task_struct to store cl_env, we assume that once + * called into Lustre, we'll never call into the other part of the kernel + * which will use those fields in task_struct without explicitly exiting + * Lustre. + * + * If there's no space in task_struct is available, hash will be used. + * bz20044, bz22683. + */ + static CFS_LIST_HEAD(cl_envs); static unsigned cl_envs_cached_nr = 0; static unsigned cl_envs_cached_max = 128; /* XXX: prototype: arbitrary limit * for now. */ -static spinlock_t cl_envs_guard = SPIN_LOCK_UNLOCKED; +static cfs_spinlock_t cl_envs_guard = CFS_SPIN_LOCK_UNLOCKED; struct cl_env { void *ce_magic; struct lu_env ce_lu; struct lu_context ce_ses; + +#ifdef LL_TASK_CL_ENV + void *ce_prev; +#else /** * This allows cl_env to be entered into cl_env_hash which implements * the current thread -> client environment lookup. */ - struct hlist_node ce_node; + cfs_hlist_node_t ce_node; +#endif /** - * Owner for the current cl_env, the key for lustre_hash. - * Now current thread pointer is stored. + * Owner for the current cl_env. + * + * If LL_TASK_CL_ENV is defined, this point to the owning cfs_current(), + * only for debugging purpose ; + * Otherwise hash is used, and this is the key for cfs_hash. + * Now current thread pid is stored. Note using thread pointer would + * lead to unbalanced hash because of its specific allocation locality + * and could be varied for different platforms and OSes, even different + * OS versions. */ void *ce_owner; + /* * Linkage into global list of all client environments. Used for * garbage collection. */ - struct list_head ce_linkage; + cfs_list_t ce_linkage; /* * */ @@ -553,40 +586,51 @@ struct cl_env { void *ce_debug; }; -#define CL_ENV_INC(counter) atomic_inc(&cl_env_stats.counter) +#define CL_ENV_INC(counter) cfs_atomic_inc(&cl_env_stats.counter) #define CL_ENV_DEC(counter) \ do { \ - LASSERT(atomic_read(&cl_env_stats.counter) > 0); \ - atomic_dec(&cl_env_stats.counter); \ + LASSERT(cfs_atomic_read(&cl_env_stats.counter) > 0); \ + cfs_atomic_dec(&cl_env_stats.counter); \ } while (0) -/***************************************************************************** - * Routins to use lustre_hash functionality to bind the current thread - * to cl_env +static void cl_env_init0(struct cl_env *cle, void *debug) +{ + LASSERT(cle->ce_ref == 0); + LASSERT(cle->ce_magic == &cl_env_init0); + LASSERT(cle->ce_debug == NULL && cle->ce_owner == NULL); + + cle->ce_ref = 1; + cle->ce_debug = debug; + CL_ENV_INC(cs_busy); +} + + +#ifndef LL_TASK_CL_ENV +/* + * The implementation of using hash table to connect cl_env and thread */ -/** lustre hash to manage the cl_env for current thread */ -static lustre_hash_t *cl_env_hash; -static void cl_env_init0(struct cl_env *cle, void *debug); +static cfs_hash_t *cl_env_hash; -static unsigned cl_env_hops_hash(lustre_hash_t *lh, void *key, unsigned mask) +static unsigned cl_env_hops_hash(cfs_hash_t *lh, + const void *key, unsigned mask) { #if BITS_PER_LONG == 64 - return lh_u64_hash((__u64)key, mask); + return cfs_hash_u64_hash((__u64)key, mask); #else - return lh_u32_hash((__u32)key, mask); + return cfs_hash_u32_hash((__u32)key, mask); #endif } -static void *cl_env_hops_obj(struct hlist_node *hn) +static void *cl_env_hops_obj(cfs_hlist_node_t *hn) { - struct cl_env *cle = hlist_entry(hn, struct cl_env, ce_node); + struct cl_env *cle = cfs_hlist_entry(hn, struct cl_env, ce_node); LASSERT(cle->ce_magic == &cl_env_init0); return (void *)cle; } -static int cl_env_hops_compare(void *key, struct hlist_node *hn) +static int cl_env_hops_keycmp(const void *key, cfs_hlist_node_t *hn) { struct cl_env *cle = cl_env_hops_obj(hn); @@ -594,18 +638,26 @@ static int cl_env_hops_compare(void *key, struct hlist_node *hn) return (key == cle->ce_owner); } -static lustre_hash_ops_t cl_env_hops = { - .lh_hash = cl_env_hops_hash, - .lh_compare = cl_env_hops_compare, - .lh_key = cl_env_hops_obj, - .lh_get = cl_env_hops_obj, - .lh_put = cl_env_hops_obj, +static void cl_env_hops_noop(cfs_hash_t *hs, cfs_hlist_node_t *hn) +{ + struct cl_env *cle = cfs_hlist_entry(hn, struct cl_env, ce_node); + LASSERT(cle->ce_magic == &cl_env_init0); +} + +static cfs_hash_ops_t cl_env_hops = { + .hs_hash = cl_env_hops_hash, + .hs_key = cl_env_hops_obj, + .hs_keycmp = cl_env_hops_keycmp, + .hs_object = cl_env_hops_obj, + .hs_get = cl_env_hops_noop, + .hs_put_locked = cl_env_hops_noop, }; static inline struct cl_env *cl_env_fetch(void) { struct cl_env *cle; - cle = lustre_hash_lookup(cl_env_hash, cfs_current()); + + cle = cfs_hash_lookup(cl_env_hash, (void *) (long) cfs_current()->pid); LASSERT(ergo(cle, cle->ce_magic == &cl_env_init0)); return cle; } @@ -614,39 +666,88 @@ static inline void cl_env_attach(struct cl_env *cle) { if (cle) { int rc; + LASSERT(cle->ce_owner == NULL); - cle->ce_owner = cfs_current(); - rc = lustre_hash_add_unique(cl_env_hash, cle->ce_owner, - &cle->ce_node); + cle->ce_owner = (void *) (long) cfs_current()->pid; + rc = cfs_hash_add_unique(cl_env_hash, cle->ce_owner, + &cle->ce_node); LASSERT(rc == 0); } } -static inline struct cl_env *cl_env_detach(struct cl_env *cle) +static inline void cl_env_do_detach(struct cl_env *cle) { - if (cle == NULL) - cle = cl_env_fetch(); - if (cle && cle->ce_owner) { - void *cookie; - LASSERT(cle->ce_owner == cfs_current()); - cookie = lustre_hash_del(cl_env_hash, cle->ce_owner, - &cle->ce_node); - cle->ce_owner = NULL; - LASSERT(cookie == cle); - } + void *cookie; + + LASSERT(cle->ce_owner == (void *) (long) cfs_current()->pid); + cookie = cfs_hash_del(cl_env_hash, cle->ce_owner, + &cle->ce_node); + LASSERT(cookie == cle); + cle->ce_owner = NULL; +} + +static int cl_env_store_init(void) { + cl_env_hash = cfs_hash_create("cl_env", + HASH_CL_ENV_BITS, HASH_CL_ENV_BITS, + HASH_CL_ENV_BKT_BITS, 0, + CFS_HASH_MIN_THETA, + CFS_HASH_MAX_THETA, + &cl_env_hops, + CFS_HASH_RW_BKTLOCK); + return cl_env_hash != NULL ? 0 :-ENOMEM; +} + +static void cl_env_store_fini(void) { + cfs_hash_putref(cl_env_hash); +} + +#else /* LL_TASK_CL_ENV */ +/* + * The implementation of store cl_env directly in thread structure. + */ + +static inline struct cl_env *cl_env_fetch(void) +{ + struct cl_env *cle; + + cle = cfs_current()->LL_TASK_CL_ENV; + if (cle && cle->ce_magic != &cl_env_init0) + cle = NULL; return cle; } -/* ----------------------- hash routines end ---------------------------- */ -static void cl_env_init0(struct cl_env *cle, void *debug) +static inline void cl_env_attach(struct cl_env *cle) { - LASSERT(cle->ce_ref == 0); - LASSERT(cle->ce_magic == &cl_env_init0); - LASSERT(cle->ce_debug == NULL && cle->ce_owner == NULL); + if (cle) { + LASSERT(cle->ce_owner == NULL); + cle->ce_owner = cfs_current(); + cle->ce_prev = cfs_current()->LL_TASK_CL_ENV; + cfs_current()->LL_TASK_CL_ENV = cle; + } +} - cle->ce_ref = 1; - cle->ce_debug = debug; - CL_ENV_INC(cs_busy); +static inline void cl_env_do_detach(struct cl_env *cle) +{ + LASSERT(cle->ce_owner == cfs_current()); + LASSERT(cfs_current()->LL_TASK_CL_ENV == cle); + cfs_current()->LL_TASK_CL_ENV = cle->ce_prev; + cle->ce_owner = NULL; +} + +static int cl_env_store_init(void) { return 0; } +static void cl_env_store_fini(void) { } + +#endif /* LL_TASK_CL_ENV */ + +static inline struct cl_env *cl_env_detach(struct cl_env *cle) +{ + if (cle == NULL) + cle = cl_env_fetch(); + + if (cle && cle->ce_owner) + cl_env_do_detach(cle); + + return cle; } static struct lu_env *cl_env_new(__u32 tags, void *debug) @@ -697,15 +798,15 @@ static struct lu_env *cl_env_obtain(void *debug) struct lu_env *env; ENTRY; - spin_lock(&cl_envs_guard); - LASSERT(equi(cl_envs_cached_nr == 0, list_empty(&cl_envs))); + cfs_spin_lock(&cl_envs_guard); + LASSERT(equi(cl_envs_cached_nr == 0, cfs_list_empty(&cl_envs))); if (cl_envs_cached_nr > 0) { int rc; cle = container_of(cl_envs.next, struct cl_env, ce_linkage); - list_del_init(&cle->ce_linkage); + cfs_list_del_init(&cle->ce_linkage); cl_envs_cached_nr--; - spin_unlock(&cl_envs_guard); + cfs_spin_unlock(&cl_envs_guard); env = &cle->ce_lu; rc = lu_env_refill(env); @@ -718,7 +819,7 @@ static struct lu_env *cl_env_obtain(void *debug) env = ERR_PTR(rc); } } else { - spin_unlock(&cl_envs_guard); + cfs_spin_unlock(&cl_envs_guard); env = cl_env_new(0, debug); } RETURN(env); @@ -746,7 +847,7 @@ struct lu_env *cl_env_peek(int *refcheck) env = &cle->ce_lu; *refcheck = ++cle->ce_ref; } - CDEBUG(D_OTHER, "%i@%p\n", cle ? cle->ce_ref : 0, cle); + CDEBUG(D_OTHER, "%d@%p\n", cle ? cle->ce_ref : 0, cle); return env; } EXPORT_SYMBOL(cl_env_peek); @@ -777,7 +878,7 @@ struct lu_env *cl_env_get(int *refcheck) cle = cl_env_container(env); cl_env_attach(cle); *refcheck = cle->ce_ref; - CDEBUG(D_OTHER, "%i@%p\n", cle->ce_ref, cle); + CDEBUG(D_OTHER, "%d@%p\n", cle->ce_ref, cle); } } return env; @@ -800,7 +901,7 @@ struct lu_env *cl_env_alloc(int *refcheck, __u32 tags) cle = cl_env_container(env); *refcheck = cle->ce_ref; - CDEBUG(D_OTHER, "%i@%p\n", cle->ce_ref, cle); + CDEBUG(D_OTHER, "%d@%p\n", cle->ce_ref, cle); } return env; } @@ -823,19 +924,19 @@ unsigned cl_env_cache_purge(unsigned nr) struct cl_env *cle; ENTRY; - spin_lock(&cl_envs_guard); - for (; !list_empty(&cl_envs) && nr > 0; --nr) { + cfs_spin_lock(&cl_envs_guard); + for (; !cfs_list_empty(&cl_envs) && nr > 0; --nr) { cle = container_of(cl_envs.next, struct cl_env, ce_linkage); - list_del_init(&cle->ce_linkage); + cfs_list_del_init(&cle->ce_linkage); LASSERT(cl_envs_cached_nr > 0); cl_envs_cached_nr--; - spin_unlock(&cl_envs_guard); + cfs_spin_unlock(&cl_envs_guard); cl_env_fini(cle); - spin_lock(&cl_envs_guard); + cfs_spin_lock(&cl_envs_guard); } - LASSERT(equi(cl_envs_cached_nr == 0, list_empty(&cl_envs))); - spin_unlock(&cl_envs_guard); + LASSERT(equi(cl_envs_cached_nr == 0, cfs_list_empty(&cl_envs))); + cfs_spin_unlock(&cl_envs_guard); RETURN(nr); } EXPORT_SYMBOL(cl_env_cache_purge); @@ -856,7 +957,7 @@ void cl_env_put(struct lu_env *env, int *refcheck) LASSERT(cle->ce_ref > 0); LASSERT(ergo(refcheck != NULL, cle->ce_ref == *refcheck)); - CDEBUG(D_OTHER, "%i@%p\n", cle->ce_ref, cle); + CDEBUG(D_OTHER, "%d@%p\n", cle->ce_ref, cle); if (--cle->ce_ref == 0) { CL_ENV_DEC(cs_busy); cl_env_detach(cle); @@ -871,10 +972,10 @@ void cl_env_put(struct lu_env *env, int *refcheck) if (cl_envs_cached_nr < cl_envs_cached_max && (env->le_ctx.lc_tags & ~LCT_HAS_EXIT) == LCT_CL_THREAD && (env->le_ses->lc_tags & ~LCT_HAS_EXIT) == LCT_SESSION) { - spin_lock(&cl_envs_guard); - list_add(&cle->ce_linkage, &cl_envs); + cfs_spin_lock(&cl_envs_guard); + cfs_list_add(&cle->ce_linkage, &cl_envs); cl_envs_cached_nr++; - spin_unlock(&cl_envs_guard); + cfs_spin_unlock(&cl_envs_guard); } else cl_env_fini(cle); } @@ -917,7 +1018,7 @@ void cl_env_implant(struct lu_env *env, int *refcheck) cl_env_attach(cle); cl_env_get(refcheck); - CDEBUG(D_OTHER, "%i@%p\n", cle->ce_ref, cle); + CDEBUG(D_OTHER, "%d@%p\n", cle->ce_ref, cle); } EXPORT_SYMBOL(cl_env_implant); @@ -930,7 +1031,7 @@ void cl_env_unplant(struct lu_env *env, int *refcheck) LASSERT(cle->ce_ref > 1); - CDEBUG(D_OTHER, "%i@%p\n", cle->ce_ref, cle); + CDEBUG(D_OTHER, "%d@%p\n", cle->ce_ref, cle); cl_env_detach(cle); cl_env_put(env, refcheck); @@ -1137,9 +1238,9 @@ int cl_global_init(void) { int result; - cl_env_hash = lustre_hash_init("cl_env", 8, 10, &cl_env_hops, 0); - if (cl_env_hash == NULL) - return -ENOMEM; + result = cl_env_store_init(); + if (result) + return result; result = lu_kmem_init(cl_object_caches); if (result == 0) { @@ -1152,7 +1253,7 @@ int cl_global_init(void) } } if (result) - lustre_hash_exit(cl_env_hash); + cl_env_store_fini(); return result; } @@ -1165,5 +1266,5 @@ void cl_global_fini(void) cl_page_fini(); lu_context_key_degister(&cl_key); lu_kmem_fini(cl_object_caches); - lustre_hash_exit(cl_env_hash); + cl_env_store_fini(); }