X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Fldlm%2Fldlm_lock.c;h=165fe683d5452dd1a065bd582463b832ebb1e286;hp=5d719d4a226ccc6fa82fa489b0e66aca8ba631c7;hb=2ad695f40cf1920033d77723311ed5ed7a3b07cc;hpb=d51f4e19e640a5601297599775f8835b12cdb1dc diff --git a/lustre/ldlm/ldlm_lock.c b/lustre/ldlm/ldlm_lock.c index 5d719d4..165fe68 100644 --- a/lustre/ldlm/ldlm_lock.c +++ b/lustre/ldlm/ldlm_lock.c @@ -1,6 +1,4 @@ -/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*- - * vim:expandtab:shiftwidth=8:tabstop=8: - * +/* * GPL HEADER START * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -26,8 +24,10 @@ * GPL HEADER END */ /* - * Copyright 2008 Sun Microsystems, Inc. All rights reserved + * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved. * Use is subject to license terms. + * + * Copyright (c) 2011, 2012, Whamcloud, Inc. */ /* * This file is part of Lustre, http://www.lustre.org/ @@ -43,9 +43,7 @@ #ifdef __KERNEL__ # include -# ifndef HAVE_VFS_INTENT_PATCHES # include -# endif #else # include #endif @@ -65,6 +63,7 @@ char *ldlm_lockname[] = { [LCK_GROUP] "GROUP", [LCK_COS] "COS" }; +EXPORT_SYMBOL(ldlm_lockname); char *ldlm_typename[] = { [LDLM_PLAIN] "PLN", @@ -72,6 +71,62 @@ char *ldlm_typename[] = { [LDLM_FLOCK] "FLK", [LDLM_IBITS] "IBT", }; +EXPORT_SYMBOL(ldlm_typename); + +static ldlm_policy_wire_to_local_t ldlm_policy_wire18_to_local[] = { + [LDLM_PLAIN - LDLM_MIN_TYPE] ldlm_plain_policy_wire_to_local, + [LDLM_EXTENT - LDLM_MIN_TYPE] ldlm_extent_policy_wire_to_local, + [LDLM_FLOCK - LDLM_MIN_TYPE] ldlm_flock_policy_wire18_to_local, + [LDLM_IBITS - LDLM_MIN_TYPE] ldlm_ibits_policy_wire_to_local, +}; + +static ldlm_policy_wire_to_local_t ldlm_policy_wire21_to_local[] = { + [LDLM_PLAIN - LDLM_MIN_TYPE] ldlm_plain_policy_wire_to_local, + [LDLM_EXTENT - LDLM_MIN_TYPE] ldlm_extent_policy_wire_to_local, + [LDLM_FLOCK - LDLM_MIN_TYPE] ldlm_flock_policy_wire21_to_local, + [LDLM_IBITS - LDLM_MIN_TYPE] ldlm_ibits_policy_wire_to_local, +}; + +static ldlm_policy_local_to_wire_t ldlm_policy_local_to_wire[] = { + [LDLM_PLAIN - LDLM_MIN_TYPE] ldlm_plain_policy_local_to_wire, + [LDLM_EXTENT - LDLM_MIN_TYPE] ldlm_extent_policy_local_to_wire, + [LDLM_FLOCK - LDLM_MIN_TYPE] ldlm_flock_policy_local_to_wire, + [LDLM_IBITS - LDLM_MIN_TYPE] ldlm_ibits_policy_local_to_wire, +}; + +/** + * Converts lock policy from local format to on the wire lock_desc format + */ +void ldlm_convert_policy_to_wire(ldlm_type_t type, + const ldlm_policy_data_t *lpolicy, + ldlm_wire_policy_data_t *wpolicy) +{ + ldlm_policy_local_to_wire_t convert; + + convert = ldlm_policy_local_to_wire[type - LDLM_MIN_TYPE]; + + convert(lpolicy, wpolicy); +} + +/** + * Converts lock policy from on the wire lock_desc format to local format + */ +void ldlm_convert_policy_to_local(struct obd_export *exp, ldlm_type_t type, + const ldlm_wire_policy_data_t *wpolicy, + ldlm_policy_data_t *lpolicy) +{ + ldlm_policy_wire_to_local_t convert; + int new_client; + + /** some badnes for 2.0.0 clients, but 2.0.0 isn't supported */ + new_client = (exp->exp_connect_flags & OBD_CONNECT_FULL20) != 0; + if (new_client) + convert = ldlm_policy_wire21_to_local[type - LDLM_MIN_TYPE]; + else + convert = ldlm_policy_wire18_to_local[type - LDLM_MIN_TYPE]; + + convert(wpolicy, lpolicy); +} char *ldlm_it2str(int it) { @@ -92,20 +147,24 @@ char *ldlm_it2str(int it) return "unlink"; case IT_GETXATTR: return "getxattr"; + case IT_LAYOUT: + return "layout"; default: CERROR("Unknown intent %d\n", it); return "UNKNOWN"; } } +EXPORT_SYMBOL(ldlm_it2str); extern cfs_mem_cache_t *ldlm_lock_slab; +#ifdef HAVE_SERVER_SUPPORT static ldlm_processing_policy ldlm_processing_policy_table[] = { [LDLM_PLAIN] ldlm_process_plain_lock, [LDLM_EXTENT] ldlm_process_extent_lock, -#ifdef __KERNEL__ +# ifdef __KERNEL__ [LDLM_FLOCK] ldlm_process_flock_lock, -#endif +# endif [LDLM_IBITS] ldlm_process_inodebits_lock, }; @@ -113,11 +172,14 @@ ldlm_processing_policy ldlm_get_processing_policy(struct ldlm_resource *res) { return ldlm_processing_policy_table[res->lr_type]; } +EXPORT_SYMBOL(ldlm_get_processing_policy); +#endif /* HAVE_SERVER_SUPPORT */ void ldlm_register_intent(struct ldlm_namespace *ns, ldlm_res_policy arg) { ns->ns_policy = arg; } +EXPORT_SYMBOL(ldlm_register_intent); /* * REFCOUNTED LOCK OBJECTS @@ -132,23 +194,18 @@ void ldlm_register_intent(struct ldlm_namespace *ns, ldlm_res_policy arg) */ struct ldlm_lock *ldlm_lock_get(struct ldlm_lock *lock) { - atomic_inc(&lock->l_refc); + cfs_atomic_inc(&lock->l_refc); return lock; } - -static void ldlm_lock_free(struct ldlm_lock *lock, size_t size) -{ - LASSERT(size == sizeof(*lock)); - OBD_SLAB_FREE(lock, ldlm_lock_slab, sizeof(*lock)); -} +EXPORT_SYMBOL(ldlm_lock_get); void ldlm_lock_put(struct ldlm_lock *lock) { ENTRY; LASSERT(lock->l_resource != LP_POISON); - LASSERT(atomic_read(&lock->l_refc) > 0); - if (atomic_dec_and_test(&lock->l_refc)) { + LASSERT(cfs_atomic_read(&lock->l_refc) > 0); + if (cfs_atomic_dec_and_test(&lock->l_refc)) { struct ldlm_resource *res; LDLM_DEBUG(lock, @@ -156,15 +213,16 @@ void ldlm_lock_put(struct ldlm_lock *lock) res = lock->l_resource; LASSERT(lock->l_destroyed); - LASSERT(list_empty(&lock->l_res_link)); - LASSERT(list_empty(&lock->l_pending_chain)); + LASSERT(cfs_list_empty(&lock->l_res_link)); + LASSERT(cfs_list_empty(&lock->l_pending_chain)); - atomic_dec(&res->lr_namespace->ns_locks); + lprocfs_counter_decr(ldlm_res_to_ns(res)->ns_stats, + LDLM_NSS_LOCKS); lu_ref_del(&res->lr_reference, "lock", lock); ldlm_resource_putref(res); lock->l_resource = NULL; if (lock->l_export) { - class_export_lock_put(lock->l_export); + class_export_lock_put(lock->l_export, lock); lock->l_export = NULL; } @@ -173,20 +231,23 @@ void ldlm_lock_put(struct ldlm_lock *lock) ldlm_interval_free(ldlm_interval_detach(lock)); lu_ref_fini(&lock->l_reference); - OBD_FREE_RCU_CB(lock, sizeof(*lock), &lock->l_handle, - ldlm_lock_free); + OBD_FREE_RCU(lock, sizeof(*lock), &lock->l_handle); } EXIT; } +EXPORT_SYMBOL(ldlm_lock_put); int ldlm_lock_remove_from_lru_nolock(struct ldlm_lock *lock) { int rc = 0; - if (!list_empty(&lock->l_lru)) { - struct ldlm_namespace *ns = lock->l_resource->lr_namespace; + if (!cfs_list_empty(&lock->l_lru)) { + struct ldlm_namespace *ns = ldlm_lock_to_ns(lock); + LASSERT(lock->l_resource->lr_type != LDLM_FLOCK); - list_del_init(&lock->l_lru); + cfs_list_del_init(&lock->l_lru); + if (lock->l_flags & LDLM_FL_SKIPPED) + lock->l_flags &= ~LDLM_FL_SKIPPED; LASSERT(ns->ns_nr_unused > 0); ns->ns_nr_unused--; rc = 1; @@ -196,47 +257,62 @@ int ldlm_lock_remove_from_lru_nolock(struct ldlm_lock *lock) int ldlm_lock_remove_from_lru(struct ldlm_lock *lock) { - struct ldlm_namespace *ns = lock->l_resource->lr_namespace; + struct ldlm_namespace *ns = ldlm_lock_to_ns(lock); int rc; + ENTRY; - spin_lock(&ns->ns_unused_lock); + if (lock->l_ns_srv) { + LASSERT(cfs_list_empty(&lock->l_lru)); + RETURN(0); + } + + cfs_spin_lock(&ns->ns_lock); rc = ldlm_lock_remove_from_lru_nolock(lock); - spin_unlock(&ns->ns_unused_lock); + cfs_spin_unlock(&ns->ns_lock); EXIT; return rc; } void ldlm_lock_add_to_lru_nolock(struct ldlm_lock *lock) { - struct ldlm_namespace *ns = lock->l_resource->lr_namespace; + struct ldlm_namespace *ns = ldlm_lock_to_ns(lock); + lock->l_last_used = cfs_time_current(); - LASSERT(list_empty(&lock->l_lru)); + LASSERT(cfs_list_empty(&lock->l_lru)); LASSERT(lock->l_resource->lr_type != LDLM_FLOCK); - list_add_tail(&lock->l_lru, &ns->ns_unused_list); + cfs_list_add_tail(&lock->l_lru, &ns->ns_unused_list); LASSERT(ns->ns_nr_unused >= 0); ns->ns_nr_unused++; } void ldlm_lock_add_to_lru(struct ldlm_lock *lock) { - struct ldlm_namespace *ns = lock->l_resource->lr_namespace; + struct ldlm_namespace *ns = ldlm_lock_to_ns(lock); + ENTRY; - spin_lock(&ns->ns_unused_lock); + cfs_spin_lock(&ns->ns_lock); ldlm_lock_add_to_lru_nolock(lock); - spin_unlock(&ns->ns_unused_lock); + cfs_spin_unlock(&ns->ns_lock); EXIT; } void ldlm_lock_touch_in_lru(struct ldlm_lock *lock) { - struct ldlm_namespace *ns = lock->l_resource->lr_namespace; + struct ldlm_namespace *ns = ldlm_lock_to_ns(lock); + ENTRY; - spin_lock(&ns->ns_unused_lock); - if (!list_empty(&lock->l_lru)) { + if (lock->l_ns_srv) { + LASSERT(cfs_list_empty(&lock->l_lru)); + EXIT; + return; + } + + cfs_spin_lock(&ns->ns_lock); + if (!cfs_list_empty(&lock->l_lru)) { ldlm_lock_remove_from_lru_nolock(lock); ldlm_lock_add_to_lru_nolock(lock); } - spin_unlock(&ns->ns_unused_lock); + cfs_spin_unlock(&ns->ns_lock); EXIT; } @@ -251,27 +327,30 @@ int ldlm_lock_destroy_internal(struct ldlm_lock *lock) if (lock->l_readers || lock->l_writers) { LDLM_ERROR(lock, "lock still has references"); - ldlm_lock_dump(D_ERROR, lock, 0); LBUG(); } - if (!list_empty(&lock->l_res_link)) { + if (!cfs_list_empty(&lock->l_res_link)) { LDLM_ERROR(lock, "lock still on resource"); - ldlm_lock_dump(D_ERROR, lock, 0); LBUG(); } if (lock->l_destroyed) { - LASSERT(list_empty(&lock->l_lru)); + LASSERT(cfs_list_empty(&lock->l_lru)); EXIT; return 0; } lock->l_destroyed = 1; - if (lock->l_export && lock->l_export->exp_lock_hash && - !hlist_unhashed(&lock->l_exp_hash)) - lustre_hash_del(lock->l_export->exp_lock_hash, - &lock->l_remote_handle, &lock->l_exp_hash); + if (lock->l_export && lock->l_export->exp_lock_hash) { + /* NB: it's safe to call cfs_hash_del() even lock isn't + * in exp_lock_hash. */ + /* In the function below, .hs_keycmp resolves to + * ldlm_export_lock_keycmp() */ + /* coverity[overrun-buffer-val] */ + cfs_hash_del(lock->l_export->exp_lock_hash, + &lock->l_remote_handle, &lock->l_exp_hash); + } ldlm_lock_remove_from_lru(lock); class_handle_unhash(&lock->l_handle); @@ -325,10 +404,20 @@ static void lock_handle_addref(void *lock) LDLM_LOCK_GET((struct ldlm_lock *)lock); } +static void lock_handle_free(void *lock, int size) +{ + LASSERT(size == sizeof(struct ldlm_lock)); + OBD_SLAB_FREE(lock, ldlm_lock_slab, size); +} + +struct portals_handle_ops lock_handle_ops = { + .hop_addref = lock_handle_addref, + .hop_free = lock_handle_free, +}; + /* * usage: pass in a resource on which you have done ldlm_resource_get - * pass in a parent lock on which you have done a ldlm_lock_get - * after return, ldlm_*_put the resource and parent + * new lock will take over the refcount. * returns: lock with refcount 2 - one for current caller and one for remote */ static struct ldlm_lock *ldlm_lock_new(struct ldlm_resource *resource) @@ -343,11 +432,11 @@ static struct ldlm_lock *ldlm_lock_new(struct ldlm_resource *resource) if (lock == NULL) RETURN(NULL); - spin_lock_init(&lock->l_lock); - lock->l_resource = ldlm_resource_getref(resource); + cfs_spin_lock_init(&lock->l_lock); + lock->l_resource = resource; lu_ref_add(&resource->lr_reference, "lock", lock); - atomic_set(&lock->l_refc, 2); + cfs_atomic_set(&lock->l_refc, 2); CFS_INIT_LIST_HEAD(&lock->l_res_link); CFS_INIT_LIST_HEAD(&lock->l_lru); CFS_INIT_LIST_HEAD(&lock->l_pending_chain); @@ -359,18 +448,24 @@ static struct ldlm_lock *ldlm_lock_new(struct ldlm_resource *resource) CFS_INIT_LIST_HEAD(&lock->l_sl_mode); CFS_INIT_LIST_HEAD(&lock->l_sl_policy); CFS_INIT_HLIST_NODE(&lock->l_exp_hash); + CFS_INIT_HLIST_NODE(&lock->l_exp_flock_hash); - atomic_inc(&resource->lr_namespace->ns_locks); + lprocfs_counter_incr(ldlm_res_to_ns(resource)->ns_stats, + LDLM_NSS_LOCKS); CFS_INIT_LIST_HEAD(&lock->l_handle.h_link); - class_handle_hash(&lock->l_handle, lock_handle_addref); + class_handle_hash(&lock->l_handle, &lock_handle_ops); - CFS_INIT_LIST_HEAD(&lock->l_extents_list); - spin_lock_init(&lock->l_extents_list_lock); - CFS_INIT_LIST_HEAD(&lock->l_cache_locks_list); lu_ref_init(&lock->l_reference); lu_ref_add(&lock->l_reference, "hash", lock); lock->l_callback_timeout = 0; +#if LUSTRE_TRACKS_LOCK_EXP_REFS + CFS_INIT_LIST_HEAD(&lock->l_exp_refs_link); + lock->l_exp_refs_nr = 0; + lock->l_exp_refs_target = NULL; +#endif + CFS_INIT_LIST_HEAD(&lock->l_exp_list); + RETURN(lock); } @@ -395,22 +490,23 @@ int ldlm_lock_change_resource(struct ldlm_namespace *ns, struct ldlm_lock *lock, LASSERT(new_resid->name[0] != 0); /* This function assumes that the lock isn't on any lists */ - LASSERT(list_empty(&lock->l_res_link)); + LASSERT(cfs_list_empty(&lock->l_res_link)); type = oldres->lr_type; unlock_res_and_lock(lock); newres = ldlm_resource_get(ns, NULL, new_resid, type, 1); - lu_ref_add(&newres->lr_reference, "lock", lock); if (newres == NULL) RETURN(-ENOMEM); + + lu_ref_add(&newres->lr_reference, "lock", lock); /* * To flip the lock from the old to the new resource, lock, oldres and * newres have to be locked. Resource spin-locks are nested within * lock->l_lock, and are taken in the memory address order to avoid * dead-locks. */ - spin_lock(&lock->l_lock); + cfs_spin_lock(&lock->l_lock); oldres = lock->l_resource; if (oldres < newres) { lock_res(oldres); @@ -431,6 +527,7 @@ int ldlm_lock_change_resource(struct ldlm_namespace *ns, struct ldlm_lock *lock, RETURN(0); } +EXPORT_SYMBOL(ldlm_lock_change_resource); /* * HANDLES @@ -440,6 +537,7 @@ void ldlm_lock2handle(const struct ldlm_lock *lock, struct lustre_handle *lockh) { lockh->cookie = lock->l_handle.h_cookie; } +EXPORT_SYMBOL(ldlm_lock2handle); /* if flags: atomically get the lock and set the flags. * Return NULL if flag already set @@ -448,8 +546,7 @@ void ldlm_lock2handle(const struct ldlm_lock *lock, struct lustre_handle *lockh) struct ldlm_lock *__ldlm_handle2lock(const struct lustre_handle *handle, int flags) { - struct ldlm_namespace *ns; - struct ldlm_lock *lock, *retval = NULL; + struct ldlm_lock *lock; ENTRY; LASSERT(handle); @@ -458,37 +555,38 @@ struct ldlm_lock *__ldlm_handle2lock(const struct lustre_handle *handle, if (lock == NULL) RETURN(NULL); - LASSERT(lock->l_resource != NULL); - ns = lock->l_resource->lr_namespace; - LASSERT(ns != NULL); + /* It's unlikely but possible that someone marked the lock as + * destroyed after we did handle2object on it */ + if (flags == 0 && !lock->l_destroyed) { + lu_ref_add(&lock->l_reference, "handle", cfs_current()); + RETURN(lock); + } - lu_ref_add_atomic(&lock->l_reference, "handle", cfs_current()); lock_res_and_lock(lock); - /* It's unlikely but possible that someone marked the lock as - * destroyed after we did handle2object on it */ - if (lock->l_destroyed) { + LASSERT(lock->l_resource != NULL); + + lu_ref_add_atomic(&lock->l_reference, "handle", cfs_current()); + if (unlikely(lock->l_destroyed)) { unlock_res_and_lock(lock); CDEBUG(D_INFO, "lock already destroyed: lock %p\n", lock); LDLM_LOCK_PUT(lock); - GOTO(out, retval); + RETURN(NULL); } if (flags && (lock->l_flags & flags)) { unlock_res_and_lock(lock); LDLM_LOCK_PUT(lock); - GOTO(out, retval); + RETURN(NULL); } if (flags) lock->l_flags |= flags; unlock_res_and_lock(lock); - retval = lock; - EXIT; - out: - return retval; + RETURN(lock); } +EXPORT_SYMBOL(__ldlm_handle2lock); void ldlm_lock2desc(struct ldlm_lock *lock, struct ldlm_lock_desc *desc) { @@ -498,17 +596,18 @@ void ldlm_lock2desc(struct ldlm_lock *lock, struct ldlm_lock_desc *desc) */ if ((lock->l_resource->lr_type == LDLM_IBITS) && (exp && !(exp->exp_connect_flags & OBD_CONNECT_IBITS))) { - struct ldlm_resource res = *lock->l_resource; - /* Make sure all the right bits are set in this lock we are going to pass to client */ LASSERTF(lock->l_policy_data.l_inodebits.bits == - (MDS_INODELOCK_LOOKUP|MDS_INODELOCK_UPDATE), + (MDS_INODELOCK_LOOKUP | MDS_INODELOCK_UPDATE | + MDS_INODELOCK_LAYOUT), "Inappropriate inode lock bits during " "conversion " LPU64 "\n", lock->l_policy_data.l_inodebits.bits); - res.lr_type = LDLM_PLAIN; - ldlm_res2desc(&res, &desc->l_resource); + + ldlm_res2desc(lock->l_resource, &desc->l_resource); + desc->l_resource.lr_type = LDLM_PLAIN; + /* Convert "new" lock mode to something old client can understand */ if ((lock->l_req_mode == LCK_CR) || @@ -532,12 +631,15 @@ void ldlm_lock2desc(struct ldlm_lock *lock, struct ldlm_lock_desc *desc) ldlm_res2desc(lock->l_resource, &desc->l_resource); desc->l_req_mode = lock->l_req_mode; desc->l_granted_mode = lock->l_granted_mode; - desc->l_policy_data = lock->l_policy_data; + ldlm_convert_policy_to_wire(lock->l_resource->lr_type, + &lock->l_policy_data, + &desc->l_policy_data); } } +EXPORT_SYMBOL(ldlm_lock2desc); void ldlm_add_bl_work_item(struct ldlm_lock *lock, struct ldlm_lock *new, - struct list_head *work_list) + cfs_list_t *work_list) { if ((lock->l_flags & LDLM_FL_AST_SENT) == 0) { LDLM_DEBUG(lock, "lock incompatible; sending blocking AST."); @@ -546,28 +648,28 @@ void ldlm_add_bl_work_item(struct ldlm_lock *lock, struct ldlm_lock *new, * discard dirty data, rather than writing back. */ if (new->l_flags & LDLM_AST_DISCARD_DATA) lock->l_flags |= LDLM_FL_DISCARD_DATA; - LASSERT(list_empty(&lock->l_bl_ast)); - list_add(&lock->l_bl_ast, work_list); + LASSERT(cfs_list_empty(&lock->l_bl_ast)); + cfs_list_add(&lock->l_bl_ast, work_list); LDLM_LOCK_GET(lock); LASSERT(lock->l_blocking_lock == NULL); lock->l_blocking_lock = LDLM_LOCK_GET(new); } } -void ldlm_add_cp_work_item(struct ldlm_lock *lock, struct list_head *work_list) +void ldlm_add_cp_work_item(struct ldlm_lock *lock, cfs_list_t *work_list) { if ((lock->l_flags & LDLM_FL_CP_REQD) == 0) { lock->l_flags |= LDLM_FL_CP_REQD; LDLM_DEBUG(lock, "lock granted; sending completion AST."); - LASSERT(list_empty(&lock->l_cp_ast)); - list_add(&lock->l_cp_ast, work_list); + LASSERT(cfs_list_empty(&lock->l_cp_ast)); + cfs_list_add(&lock->l_cp_ast, work_list); LDLM_LOCK_GET(lock); } } /* must be called with lr_lock held */ void ldlm_add_ast_work_item(struct ldlm_lock *lock, struct ldlm_lock *new, - struct list_head *work_list) + cfs_list_t *work_list) { ENTRY; check_res_locked(lock->l_resource); @@ -587,6 +689,7 @@ void ldlm_lock_addref(struct lustre_handle *lockh, __u32 mode) ldlm_lock_addref_internal(lock, mode); LDLM_LOCK_PUT(lock); } +EXPORT_SYMBOL(ldlm_lock_addref); void ldlm_lock_addref_internal_nolock(struct ldlm_lock *lock, __u32 mode) { @@ -631,6 +734,7 @@ int ldlm_lock_addref_try(struct lustre_handle *lockh, __u32 mode) } return result; } +EXPORT_SYMBOL(ldlm_lock_addref_try); /* only called for local locks */ void ldlm_lock_addref_internal(struct ldlm_lock *lock, __u32 mode) @@ -669,7 +773,7 @@ void ldlm_lock_decref_internal(struct ldlm_lock *lock, __u32 mode) lock_res_and_lock(lock); - ns = lock->l_resource->lr_namespace; + ns = ldlm_lock_to_ns(lock); ldlm_lock_decref_internal_nolock(lock, mode); @@ -685,7 +789,7 @@ void ldlm_lock_decref_internal(struct ldlm_lock *lock, __u32 mode) (lock->l_flags & LDLM_FL_CBPENDING)) { /* If we received a blocked AST and this was the last reference, * run the callback. */ - if (ns_is_server(ns) && lock->l_export) + if (lock->l_ns_srv && lock->l_export) CERROR("FL_CBPENDING set on non-local lock--just a " "warning\n"); @@ -703,7 +807,11 @@ void ldlm_lock_decref_internal(struct ldlm_lock *lock, __u32 mode) ldlm_handle_bl_callback(ns, NULL, lock); } else if (ns_is_client(ns) && !lock->l_readers && !lock->l_writers && + !(lock->l_flags & LDLM_FL_NO_LRU) && !(lock->l_flags & LDLM_FL_BL_AST)) { + + LDLM_DEBUG(lock, "add lock into lru list"); + /* If this is a client-side namespace and this was the last * reference, put it on the LRU. */ ldlm_lock_add_to_lru(lock); @@ -719,6 +827,7 @@ void ldlm_lock_decref_internal(struct ldlm_lock *lock, __u32 mode) !ns_connect_lru_resize(ns)) ldlm_cancel_lru(ns, 0, LDLM_ASYNC, 0); } else { + LDLM_DEBUG(lock, "do not add lock into lru list"); unlock_res_and_lock(lock); } @@ -732,6 +841,7 @@ void ldlm_lock_decref(struct lustre_handle *lockh, __u32 mode) ldlm_lock_decref_internal(lock, mode); LDLM_LOCK_PUT(lock); } +EXPORT_SYMBOL(ldlm_lock_decref); /* This will drop a lock reference and mark it for destruction, but will not * necessarily cancel the lock before returning. */ @@ -749,11 +859,12 @@ void ldlm_lock_decref_and_cancel(struct lustre_handle *lockh, __u32 mode) ldlm_lock_decref_internal(lock, mode); LDLM_LOCK_PUT(lock); } +EXPORT_SYMBOL(ldlm_lock_decref_and_cancel); struct sl_insert_point { - struct list_head *res_link; - struct list_head *mode_link; - struct list_head *policy_link; + cfs_list_t *res_link; + cfs_list_t *mode_link; + cfs_list_t *policy_link; }; /* @@ -770,19 +881,19 @@ struct sl_insert_point { * NOTE: called by * - ldlm_grant_lock_with_skiplist */ -static void search_granted_lock(struct list_head *queue, +static void search_granted_lock(cfs_list_t *queue, struct ldlm_lock *req, struct sl_insert_point *prev) { - struct list_head *tmp; + cfs_list_t *tmp; struct ldlm_lock *lock, *mode_end, *policy_end; ENTRY; - list_for_each(tmp, queue) { - lock = list_entry(tmp, struct ldlm_lock, l_res_link); + cfs_list_for_each(tmp, queue) { + lock = cfs_list_entry(tmp, struct ldlm_lock, l_res_link); - mode_end = list_entry(lock->l_sl_mode.prev, struct ldlm_lock, - l_sl_mode); + mode_end = cfs_list_entry(lock->l_sl_mode.prev, + struct ldlm_lock, l_sl_mode); if (lock->l_req_mode != req->l_req_mode) { /* jump to last lock of mode group */ @@ -800,9 +911,10 @@ static void search_granted_lock(struct list_head *queue, return; } else if (lock->l_resource->lr_type == LDLM_IBITS) { for (;;) { - policy_end = list_entry(lock->l_sl_policy.prev, - struct ldlm_lock, - l_sl_policy); + policy_end = + cfs_list_entry(lock->l_sl_policy.prev, + struct ldlm_lock, + l_sl_policy); if (lock->l_policy_data.l_inodebits.bits == req->l_policy_data.l_inodebits.bits) { @@ -824,8 +936,8 @@ static void search_granted_lock(struct list_head *queue, /* go to next policy group within mode group */ tmp = policy_end->l_res_link.next; - lock = list_entry(tmp, struct ldlm_lock, - l_res_link); + lock = cfs_list_entry(tmp, struct ldlm_lock, + l_res_link); } /* loop over policy groups within the mode group */ /* insert point is last lock of the mode group, @@ -859,21 +971,20 @@ static void ldlm_granted_list_add_lock(struct ldlm_lock *lock, check_res_locked(res); ldlm_resource_dump(D_INFO, res); - CDEBUG(D_OTHER, "About to add this lock:\n"); - ldlm_lock_dump(D_OTHER, lock, 0); + LDLM_DEBUG(lock, "About to add lock:"); if (lock->l_destroyed) { CDEBUG(D_OTHER, "Lock destroyed, not adding to resource\n"); return; } - LASSERT(list_empty(&lock->l_res_link)); - LASSERT(list_empty(&lock->l_sl_mode)); - LASSERT(list_empty(&lock->l_sl_policy)); + LASSERT(cfs_list_empty(&lock->l_res_link)); + LASSERT(cfs_list_empty(&lock->l_sl_mode)); + LASSERT(cfs_list_empty(&lock->l_sl_policy)); - list_add(&lock->l_res_link, prev->res_link); - list_add(&lock->l_sl_mode, prev->mode_link); - list_add(&lock->l_sl_policy, prev->policy_link); + cfs_list_add(&lock->l_res_link, prev->res_link); + cfs_list_add(&lock->l_sl_mode, prev->mode_link); + cfs_list_add(&lock->l_sl_policy, prev->policy_link); EXIT; } @@ -897,7 +1008,7 @@ static void ldlm_grant_lock_with_skiplist(struct ldlm_lock *lock) * * must be called with lr_lock held */ -void ldlm_grant_lock(struct ldlm_lock *lock, struct list_head *work_list) +void ldlm_grant_lock(struct ldlm_lock *lock, cfs_list_t *work_list) { struct ldlm_resource *res = lock->l_resource; ENTRY; @@ -918,25 +1029,25 @@ void ldlm_grant_lock(struct ldlm_lock *lock, struct list_head *work_list) if (work_list && lock->l_completion_ast != NULL) ldlm_add_ast_work_item(lock, NULL, work_list); - ldlm_pool_add(&res->lr_namespace->ns_pool, lock); + ldlm_pool_add(&ldlm_res_to_ns(res)->ns_pool, lock); EXIT; } /* returns a referenced lock or NULL. See the flag descriptions below, in the * comment above ldlm_lock_match */ -static struct ldlm_lock *search_queue(struct list_head *queue, +static struct ldlm_lock *search_queue(cfs_list_t *queue, ldlm_mode_t *mode, ldlm_policy_data_t *policy, struct ldlm_lock *old_lock, int flags, int unref) { struct ldlm_lock *lock; - struct list_head *tmp; + cfs_list_t *tmp; - list_for_each(tmp, queue) { + cfs_list_for_each(tmp, queue) { ldlm_mode_t match; - lock = list_entry(tmp, struct ldlm_lock, l_res_link); + lock = cfs_list_entry(tmp, struct ldlm_lock, l_res_link); if (lock == old_lock) break; @@ -978,7 +1089,8 @@ static struct ldlm_lock *search_queue(struct list_head *queue, continue; if (!unref && - (lock->l_destroyed || (lock->l_flags & LDLM_FL_FAILED))) + (lock->l_destroyed || lock->l_flags & LDLM_FL_FAILED || + lock->l_failed)) continue; if ((flags & LDLM_FL_LOCAL_ONLY) && @@ -998,11 +1110,29 @@ static struct ldlm_lock *search_queue(struct list_head *queue, return NULL; } +void ldlm_lock_fail_match_locked(struct ldlm_lock *lock) +{ + if (!lock->l_failed) { + lock->l_failed = 1; + cfs_waitq_broadcast(&lock->l_waitq); + } +} +EXPORT_SYMBOL(ldlm_lock_fail_match_locked); + +void ldlm_lock_fail_match(struct ldlm_lock *lock) +{ + lock_res_and_lock(lock); + ldlm_lock_fail_match_locked(lock); + unlock_res_and_lock(lock); +} +EXPORT_SYMBOL(ldlm_lock_fail_match); + void ldlm_lock_allow_match_locked(struct ldlm_lock *lock) { lock->l_flags |= LDLM_FL_LVB_READY; - cfs_waitq_signal(&lock->l_waitq); + cfs_waitq_broadcast(&lock->l_waitq); } +EXPORT_SYMBOL(ldlm_lock_allow_match_locked); void ldlm_lock_allow_match(struct ldlm_lock *lock) { @@ -1010,6 +1140,7 @@ void ldlm_lock_allow_match(struct ldlm_lock *lock) ldlm_lock_allow_match_locked(lock); unlock_res_and_lock(lock); } +EXPORT_SYMBOL(ldlm_lock_allow_match); /* Can be called in two ways: * @@ -1049,7 +1180,7 @@ ldlm_mode_t ldlm_lock_match(struct ldlm_namespace *ns, int flags, old_lock = ldlm_handle2lock(lockh); LASSERT(old_lock); - ns = old_lock->l_resource->lr_namespace; + ns = ldlm_lock_to_ns(old_lock); res_id = &old_lock->l_resource->lr_name; type = old_lock->l_resource->lr_type; mode = old_lock->l_req_mode; @@ -1110,7 +1241,16 @@ ldlm_mode_t ldlm_lock_match(struct ldlm_namespace *ns, int flags, /* XXX FIXME see comment on CAN_MATCH in lustre_dlm.h */ l_wait_event(lock->l_waitq, - (lock->l_flags & LDLM_FL_LVB_READY), &lwi); + lock->l_flags & LDLM_FL_LVB_READY || + lock->l_failed, + &lwi); + if (!(lock->l_flags & LDLM_FL_LVB_READY)) { + if (flags & LDLM_FL_TEST_LOCK) + LDLM_LOCK_RELEASE(lock); + else + ldlm_lock_decref_internal(lock, mode); + rc = 0; + } } } out2: @@ -1147,6 +1287,42 @@ ldlm_mode_t ldlm_lock_match(struct ldlm_namespace *ns, int flags, return rc ? mode : 0; } +EXPORT_SYMBOL(ldlm_lock_match); + +ldlm_mode_t ldlm_revalidate_lock_handle(struct lustre_handle *lockh, + __u64 *bits) +{ + struct ldlm_lock *lock; + ldlm_mode_t mode = 0; + ENTRY; + + lock = ldlm_handle2lock(lockh); + if (lock != NULL) { + lock_res_and_lock(lock); + if (lock->l_destroyed || lock->l_flags & LDLM_FL_FAILED || + lock->l_failed) + GOTO(out, mode); + + if (lock->l_flags & LDLM_FL_CBPENDING && + lock->l_readers == 0 && lock->l_writers == 0) + GOTO(out, mode); + + if (bits) + *bits = lock->l_policy_data.l_inodebits.bits; + mode = lock->l_granted_mode; + ldlm_lock_addref_internal_nolock(lock, mode); + } + + EXIT; + +out: + if (lock != NULL) { + unlock_res_and_lock(lock); + LDLM_LOCK_PUT(lock); + } + return mode; +} +EXPORT_SYMBOL(ldlm_revalidate_lock_handle); /* Returns a referenced lock */ struct ldlm_lock *ldlm_lock_create(struct ldlm_namespace *ns, @@ -1165,7 +1341,6 @@ struct ldlm_lock *ldlm_lock_create(struct ldlm_namespace *ns, RETURN(NULL); lock = ldlm_lock_new(res); - ldlm_resource_putref(res); if (lock == NULL) RETURN(NULL); @@ -1173,6 +1348,7 @@ struct ldlm_lock *ldlm_lock_create(struct ldlm_namespace *ns, lock->l_req_mode = mode; lock->l_ast_data = data; lock->l_pid = cfs_curproc_pid(); + lock->l_ns_srv = !!ns_is_server(ns); if (cbs) { lock->l_blocking_ast = cbs->lcs_blocking; lock->l_completion_ast = cbs->lcs_completion; @@ -1194,13 +1370,14 @@ struct ldlm_lock *ldlm_lock_create(struct ldlm_namespace *ns, GOTO(out, 0); } + if (OBD_FAIL_CHECK(OBD_FAIL_LDLM_NEW_LOCK)) + GOTO(out, 0); + RETURN(lock); out: - if (lock->l_lvb_data) - OBD_FREE(lock->l_lvb_data, lvb_len); - ldlm_interval_free(ldlm_interval_detach(lock)); - OBD_SLAB_FREE(lock, ldlm_lock_slab, sizeof(*lock)); + ldlm_lock_destroy(lock); + LDLM_LOCK_RELEASE(lock); return NULL; } @@ -1210,8 +1387,10 @@ ldlm_error_t ldlm_lock_enqueue(struct ldlm_namespace *ns, { struct ldlm_lock *lock = *lockp; struct ldlm_resource *res = lock->l_resource; - int local = ns_is_client(res->lr_namespace); + int local = ns_is_client(ldlm_res_to_ns(res)); +#ifdef HAVE_SERVER_SUPPORT ldlm_processing_policy policy; +#endif ldlm_error_t rc = ELDLM_OK; struct ldlm_interval *node = NULL; ENTRY; @@ -1292,6 +1471,7 @@ ldlm_error_t ldlm_lock_enqueue(struct ldlm_namespace *ns, else ldlm_grant_lock(lock, NULL); GOTO(out, ELDLM_OK); +#ifdef HAVE_SERVER_SUPPORT } else if (*flags & LDLM_FL_REPLAY) { if (*flags & LDLM_FL_BLOCK_CONV) { ldlm_resource_add_lock(res, &res->lr_converting, lock); @@ -1309,6 +1489,14 @@ ldlm_error_t ldlm_lock_enqueue(struct ldlm_namespace *ns, policy = ldlm_processing_policy_table[res->lr_type]; policy(lock, flags, 1, &rc, NULL); GOTO(out, rc); +#else + } else { + CERROR("This is client-side-only module, cannot handle " + "LDLM_NAMESPACE_SERVER resource type lock.\n"); + LBUG(); + } +#endif + out: unlock_res_and_lock(lock); if (node) @@ -1316,11 +1504,12 @@ out: return rc; } +#ifdef HAVE_SERVER_SUPPORT /* Must be called with namespace taken: queue is waiting or converting. */ -int ldlm_reprocess_queue(struct ldlm_resource *res, struct list_head *queue, - struct list_head *work_list) +int ldlm_reprocess_queue(struct ldlm_resource *res, cfs_list_t *queue, + cfs_list_t *work_list) { - struct list_head *tmp, *pos; + cfs_list_t *tmp, *pos; ldlm_processing_policy policy; int flags; int rc = LDLM_ITER_CONTINUE; @@ -1332,9 +1521,9 @@ int ldlm_reprocess_queue(struct ldlm_resource *res, struct list_head *queue, policy = ldlm_processing_policy_table[res->lr_type]; LASSERT(policy); - list_for_each_safe(tmp, pos, queue) { + cfs_list_for_each_safe(tmp, pos, queue) { struct ldlm_lock *pending; - pending = list_entry(tmp, struct ldlm_lock, l_res_link); + pending = cfs_list_entry(tmp, struct ldlm_lock, l_res_link); CDEBUG(D_INFO, "Reprocessing lock %p\n", pending); @@ -1346,165 +1535,197 @@ int ldlm_reprocess_queue(struct ldlm_resource *res, struct list_head *queue, RETURN(rc); } +#endif -/* Helper function for ldlm_run_ast_work(). - * - * Send an existing rpc set specified by @arg->set and then - * destroy it. Create new one if @do_create flag is set. */ -static void -ldlm_send_and_maybe_create_set(struct ldlm_cb_set_arg *arg, int do_create) +static int +ldlm_work_bl_ast_lock(struct ptlrpc_request_set *rqset, void *opaq) { - ENTRY; + struct ldlm_cb_set_arg *arg = opaq; + struct ldlm_lock_desc d; + int rc; + struct ldlm_lock *lock; + ENTRY; - ptlrpc_set_wait(arg->set); - if (arg->type == LDLM_BL_CALLBACK) - OBD_FAIL_TIMEOUT(OBD_FAIL_LDLM_GLIMPSE, 2); - ptlrpc_set_destroy(arg->set); + if (cfs_list_empty(arg->list)) + RETURN(-ENOENT); - if (do_create) - arg->set = ptlrpc_prep_set(); + lock = cfs_list_entry(arg->list->next, struct ldlm_lock, l_bl_ast); - EXIT; -} + /* nobody should touch l_bl_ast */ + lock_res_and_lock(lock); + cfs_list_del_init(&lock->l_bl_ast); -static int -ldlm_work_bl_ast_lock(struct list_head *tmp, struct ldlm_cb_set_arg *arg) -{ - struct ldlm_lock_desc d; - struct ldlm_lock *lock = list_entry(tmp, struct ldlm_lock, l_bl_ast); - ENTRY; + LASSERT(lock->l_flags & LDLM_FL_AST_SENT); + LASSERT(lock->l_bl_ast_run == 0); + LASSERT(lock->l_blocking_lock); + lock->l_bl_ast_run++; + unlock_res_and_lock(lock); - /* nobody should touch l_bl_ast */ - lock_res_and_lock(lock); - list_del_init(&lock->l_bl_ast); + ldlm_lock2desc(lock->l_blocking_lock, &d); - LASSERT(lock->l_flags & LDLM_FL_AST_SENT); - LASSERT(lock->l_bl_ast_run == 0); - LASSERT(lock->l_blocking_lock); - lock->l_bl_ast_run++; - unlock_res_and_lock(lock); + rc = lock->l_blocking_ast(lock, &d, (void *)arg, LDLM_CB_BLOCKING); + LDLM_LOCK_RELEASE(lock->l_blocking_lock); + lock->l_blocking_lock = NULL; + LDLM_LOCK_RELEASE(lock); - ldlm_lock2desc(lock->l_blocking_lock, &d); - - lock->l_blocking_ast(lock, &d, (void *)arg, - LDLM_CB_BLOCKING); - LDLM_LOCK_RELEASE(lock->l_blocking_lock); - lock->l_blocking_lock = NULL; - LDLM_LOCK_RELEASE(lock); + RETURN(rc); +} - RETURN(1); +static int +ldlm_work_cp_ast_lock(struct ptlrpc_request_set *rqset, void *opaq) +{ + struct ldlm_cb_set_arg *arg = opaq; + int rc = 0; + struct ldlm_lock *lock; + ldlm_completion_callback completion_callback; + ENTRY; + + if (cfs_list_empty(arg->list)) + RETURN(-ENOENT); + + lock = cfs_list_entry(arg->list->next, struct ldlm_lock, l_cp_ast); + + /* It's possible to receive a completion AST before we've set + * the l_completion_ast pointer: either because the AST arrived + * before the reply, or simply because there's a small race + * window between receiving the reply and finishing the local + * enqueue. (bug 842) + * + * This can't happen with the blocking_ast, however, because we + * will never call the local blocking_ast until we drop our + * reader/writer reference, which we won't do until we get the + * reply and finish enqueueing. */ + + /* nobody should touch l_cp_ast */ + lock_res_and_lock(lock); + cfs_list_del_init(&lock->l_cp_ast); + LASSERT(lock->l_flags & LDLM_FL_CP_REQD); + /* save l_completion_ast since it can be changed by + * mds_intent_policy(), see bug 14225 */ + completion_callback = lock->l_completion_ast; + lock->l_flags &= ~LDLM_FL_CP_REQD; + unlock_res_and_lock(lock); + + if (completion_callback != NULL) + rc = completion_callback(lock, 0, (void *)arg); + LDLM_LOCK_RELEASE(lock); + + RETURN(rc); } static int -ldlm_work_cp_ast_lock(struct list_head *tmp, struct ldlm_cb_set_arg *arg) +ldlm_work_revoke_ast_lock(struct ptlrpc_request_set *rqset, void *opaq) { - struct ldlm_lock *lock = list_entry(tmp, struct ldlm_lock, l_cp_ast); - ldlm_completion_callback completion_callback; - int rc = 0; - ENTRY; + struct ldlm_cb_set_arg *arg = opaq; + struct ldlm_lock_desc desc; + int rc; + struct ldlm_lock *lock; + ENTRY; - /* It's possible to receive a completion AST before we've set - * the l_completion_ast pointer: either because the AST arrived - * before the reply, or simply because there's a small race - * window between receiving the reply and finishing the local - * enqueue. (bug 842) - * - * This can't happen with the blocking_ast, however, because we - * will never call the local blocking_ast until we drop our - * reader/writer reference, which we won't do until we get the - * reply and finish enqueueing. */ + if (cfs_list_empty(arg->list)) + RETURN(-ENOENT); - /* nobody should touch l_cp_ast */ - lock_res_and_lock(lock); - list_del_init(&lock->l_cp_ast); - LASSERT(lock->l_flags & LDLM_FL_CP_REQD); - /* save l_completion_ast since it can be changed by - * mds_intent_policy(), see bug 14225 */ - completion_callback = lock->l_completion_ast; - lock->l_flags &= ~LDLM_FL_CP_REQD; - unlock_res_and_lock(lock); + lock = cfs_list_entry(arg->list->next, struct ldlm_lock, l_rk_ast); + cfs_list_del_init(&lock->l_rk_ast); - if (completion_callback != NULL) { - completion_callback(lock, 0, (void *)arg); - rc = 1; - } - LDLM_LOCK_RELEASE(lock); + /* the desc just pretend to exclusive */ + ldlm_lock2desc(lock, &desc); + desc.l_req_mode = LCK_EX; + desc.l_granted_mode = 0; - RETURN(rc); + rc = lock->l_blocking_ast(lock, &desc, (void*)arg, LDLM_CB_BLOCKING); + LDLM_LOCK_RELEASE(lock); + + RETURN(rc); } -static int -ldlm_work_revoke_ast_lock(struct list_head *tmp, struct ldlm_cb_set_arg *arg) +int ldlm_work_gl_ast_lock(struct ptlrpc_request_set *rqset, void *opaq) { - struct ldlm_lock_desc desc; - struct ldlm_lock *lock = list_entry(tmp, struct ldlm_lock, l_rk_ast); - ENTRY; + struct ldlm_cb_set_arg *arg = opaq; + struct ldlm_glimpse_work *gl_work; + struct ldlm_lock *lock; + int rc = 0; + ENTRY; - list_del_init(&lock->l_rk_ast); + if (cfs_list_empty(arg->list)) + RETURN(-ENOENT); - /* the desc just pretend to exclusive */ - ldlm_lock2desc(lock, &desc); - desc.l_req_mode = LCK_EX; - desc.l_granted_mode = 0; + gl_work = cfs_list_entry(arg->list->next, struct ldlm_glimpse_work, + gl_list); + cfs_list_del_init(&gl_work->gl_list); - lock->l_blocking_ast(lock, &desc, (void*)arg, LDLM_CB_BLOCKING); - LDLM_LOCK_RELEASE(lock); - - RETURN(1); -} + lock = gl_work->gl_lock; -int ldlm_run_ast_work(struct list_head *rpc_list, ldlm_desc_ast_t ast_type) -{ - struct ldlm_cb_set_arg arg; - struct list_head *tmp, *pos; - int (*work_ast_lock)(struct list_head *tmp,struct ldlm_cb_set_arg *arg); - int ast_count; - ENTRY; + /* transfer the glimpse descriptor to ldlm_cb_set_arg */ + arg->gl_desc = gl_work->gl_desc; - arg.set = ptlrpc_prep_set(); - if (NULL == arg.set) - RETURN(-ERESTART); - atomic_set(&arg.restart, 0); - switch (ast_type) { - case LDLM_WORK_BL_AST: - arg.type = LDLM_BL_CALLBACK; - work_ast_lock = ldlm_work_bl_ast_lock; - break; - case LDLM_WORK_CP_AST: - arg.type = LDLM_CP_CALLBACK; - work_ast_lock = ldlm_work_cp_ast_lock; - break; - case LDLM_WORK_REVOKE_AST: - arg.type = LDLM_BL_CALLBACK; - work_ast_lock = ldlm_work_revoke_ast_lock; - break; - default: - LBUG(); - } + /* invoke the actual glimpse callback */ + if (lock->l_glimpse_ast(lock, (void*)arg) == 0) + rc = 1; - ast_count = 0; - list_for_each_safe(tmp, pos, rpc_list) { - ast_count += work_ast_lock(tmp, &arg); + LDLM_LOCK_RELEASE(lock); - /* Send the request set if it exceeds the PARALLEL_AST_LIMIT, - * and create a new set for requests that remained in - * @rpc_list */ - if (unlikely(ast_count == PARALLEL_AST_LIMIT)) { - ldlm_send_and_maybe_create_set(&arg, 1); - ast_count = 0; - } - } + if ((gl_work->gl_flags & LDLM_GL_WORK_NOFREE) == 0) + OBD_FREE_PTR(gl_work); - if (ast_count > 0) - ldlm_send_and_maybe_create_set(&arg, 0); - else - /* In case when number of ASTs is multiply of - * PARALLEL_AST_LIMIT or @rpc_list was initially empty, - * @arg.set must be destroyed here, otherwise we get - * write memory leaking. */ - ptlrpc_set_destroy(arg.set); + RETURN(rc); +} - RETURN(atomic_read(&arg.restart) ? -ERESTART : 0); +int ldlm_run_ast_work(struct ldlm_namespace *ns, cfs_list_t *rpc_list, + ldlm_desc_ast_t ast_type) +{ + struct ldlm_cb_set_arg *arg; + set_producer_func work_ast_lock; + int rc; + + if (cfs_list_empty(rpc_list)) + RETURN(0); + + OBD_ALLOC_PTR(arg); + if (arg == NULL) + RETURN(-ENOMEM); + + cfs_atomic_set(&arg->restart, 0); + arg->list = rpc_list; + + switch (ast_type) { + case LDLM_WORK_BL_AST: + arg->type = LDLM_BL_CALLBACK; + work_ast_lock = ldlm_work_bl_ast_lock; + break; + case LDLM_WORK_CP_AST: + arg->type = LDLM_CP_CALLBACK; + work_ast_lock = ldlm_work_cp_ast_lock; + break; + case LDLM_WORK_REVOKE_AST: + arg->type = LDLM_BL_CALLBACK; + work_ast_lock = ldlm_work_revoke_ast_lock; + break; + case LDLM_WORK_GL_AST: + arg->type = LDLM_GL_CALLBACK; + work_ast_lock = ldlm_work_gl_ast_lock; + break; + default: + LBUG(); + } + + /* We create a ptlrpc request set with flow control extension. + * This request set will use the work_ast_lock function to produce new + * requests and will send a new request each time one completes in order + * to keep the number of requests in flight to ns_max_parallel_ast */ + arg->set = ptlrpc_prep_fcset(ns->ns_max_parallel_ast ? : UINT_MAX, + work_ast_lock, arg); + if (arg->set == NULL) + GOTO(out, rc = -ENOMEM); + + ptlrpc_set_wait(arg->set); + ptlrpc_set_destroy(arg->set); + + rc = cfs_atomic_read(&arg->restart) ? -ERESTART : 0; + GOTO(out, rc); +out: + OBD_FREE_PTR(arg); + return rc; } static int reprocess_one_queue(struct ldlm_resource *res, void *closure) @@ -1513,66 +1734,63 @@ static int reprocess_one_queue(struct ldlm_resource *res, void *closure) return LDLM_ITER_CONTINUE; } -void ldlm_reprocess_all_ns(struct ldlm_namespace *ns) +static int ldlm_reprocess_res(cfs_hash_t *hs, cfs_hash_bd_t *bd, + cfs_hlist_node_t *hnode, void *arg) { - struct list_head *tmp; - int i, rc; + struct ldlm_resource *res = cfs_hash_object(hs, hnode); + int rc; - if (ns == NULL) - return; + rc = reprocess_one_queue(res, arg); + + return rc == LDLM_ITER_STOP; +} +void ldlm_reprocess_all_ns(struct ldlm_namespace *ns) +{ ENTRY; - spin_lock(&ns->ns_hash_lock); - for (i = 0; i < RES_HASH_SIZE; i++) { - tmp = ns->ns_hash[i].next; - while (tmp != &(ns->ns_hash[i])) { - struct ldlm_resource *res = - list_entry(tmp, struct ldlm_resource, lr_hash); - - ldlm_resource_getref(res); - spin_unlock(&ns->ns_hash_lock); - LDLM_RESOURCE_ADDREF(res); - - rc = reprocess_one_queue(res, NULL); - - LDLM_RESOURCE_DELREF(res); - spin_lock(&ns->ns_hash_lock); - tmp = tmp->next; - ldlm_resource_putref_locked(res); - - if (rc == LDLM_ITER_STOP) - GOTO(out, rc); - } + + if (ns != NULL) { + cfs_hash_for_each_nolock(ns->ns_rs_hash, + ldlm_reprocess_res, NULL); } - out: - spin_unlock(&ns->ns_hash_lock); EXIT; } +EXPORT_SYMBOL(ldlm_reprocess_all_ns); void ldlm_reprocess_all(struct ldlm_resource *res) { CFS_LIST_HEAD(rpc_list); + +#ifdef HAVE_SERVER_SUPPORT int rc; ENTRY; - /* Local lock trees don't get reprocessed. */ - if (ns_is_client(res->lr_namespace)) { + if (ns_is_client(ldlm_res_to_ns(res))) { EXIT; return; } - restart: +restart: lock_res(res); rc = ldlm_reprocess_queue(res, &res->lr_converting, &rpc_list); if (rc == LDLM_ITER_CONTINUE) ldlm_reprocess_queue(res, &res->lr_waiting, &rpc_list); unlock_res(res); - rc = ldlm_run_ast_work(&rpc_list, LDLM_WORK_CP_AST); + rc = ldlm_run_ast_work(ldlm_res_to_ns(res), &rpc_list, + LDLM_WORK_CP_AST); if (rc == -ERESTART) { - LASSERT(list_empty(&rpc_list)); + LASSERT(cfs_list_empty(&rpc_list)); goto restart; } +#else + ENTRY; + if (!ns_is_client(ldlm_res_to_ns(res))) { + CERROR("This is client-side-only module, cannot handle " + "LDLM_NAMESPACE_SERVER resource type lock.\n"); + LBUG(); + } +#endif EXIT; } @@ -1600,8 +1818,8 @@ void ldlm_unlink_lock_skiplist(struct ldlm_lock *req) req->l_resource->lr_type != LDLM_IBITS) return; - list_del_init(&req->l_sl_policy); - list_del_init(&req->l_sl_mode); + cfs_list_del_init(&req->l_sl_policy); + cfs_list_del_init(&req->l_sl_mode); } void ldlm_lock_cancel(struct ldlm_lock *lock) @@ -1613,7 +1831,7 @@ void ldlm_lock_cancel(struct ldlm_lock *lock) lock_res_and_lock(lock); res = lock->l_resource; - ns = res->lr_namespace; + ns = ldlm_res_to_ns(res); /* Please do not, no matter how tempting, remove this LBUG without * talking to me first. -phik */ @@ -1622,14 +1840,17 @@ void ldlm_lock_cancel(struct ldlm_lock *lock) LBUG(); } - ldlm_del_waiting_lock(lock); + if (lock->l_waited) + ldlm_del_waiting_lock(lock); /* Releases cancel callback. */ ldlm_cancel_callback(lock); /* Yes, second time, just in case it was added again while we were running with no res lock in ldlm_cancel_callback */ - ldlm_del_waiting_lock(lock); + if (lock->l_waited) + ldlm_del_waiting_lock(lock); + ldlm_resource_unlink_lock(lock); ldlm_lock_destroy_nolock(lock); @@ -1643,41 +1864,70 @@ void ldlm_lock_cancel(struct ldlm_lock *lock) EXIT; } +EXPORT_SYMBOL(ldlm_lock_cancel); int ldlm_lock_set_data(struct lustre_handle *lockh, void *data) { struct ldlm_lock *lock = ldlm_handle2lock(lockh); + int rc = -EINVAL; ENTRY; - if (lock == NULL) - RETURN(-EINVAL); - - lock->l_ast_data = data; - LDLM_LOCK_PUT(lock); - RETURN(0); + if (lock) { + if (lock->l_ast_data == NULL) + lock->l_ast_data = data; + if (lock->l_ast_data == data) + rc = 0; + LDLM_LOCK_PUT(lock); + } + RETURN(rc); } +EXPORT_SYMBOL(ldlm_lock_set_data); + +struct export_cl_data { + struct obd_export *ecl_exp; + int ecl_loop; +}; + +int ldlm_cancel_locks_for_export_cb(cfs_hash_t *hs, cfs_hash_bd_t *bd, + cfs_hlist_node_t *hnode, void *data) -void ldlm_cancel_locks_for_export_cb(void *obj, void *data) { - struct obd_export *exp = data; - struct ldlm_lock *lock = obj; + struct export_cl_data *ecl = (struct export_cl_data *)data; + struct obd_export *exp = ecl->ecl_exp; + struct ldlm_lock *lock = cfs_hash_object(hs, hnode); struct ldlm_resource *res; res = ldlm_resource_getref(lock->l_resource); LDLM_LOCK_GET(lock); LDLM_DEBUG(lock, "export %p", exp); - ldlm_res_lvbo_update(res, NULL, 0, 1); + ldlm_res_lvbo_update(res, NULL, 1); ldlm_lock_cancel(lock); ldlm_reprocess_all(res); ldlm_resource_putref(res); LDLM_LOCK_RELEASE(lock); + + ecl->ecl_loop++; + if ((ecl->ecl_loop & -ecl->ecl_loop) == ecl->ecl_loop) { + CDEBUG(D_INFO, + "Cancel lock %p for export %p (loop %d), still have " + "%d locks left on hash table.\n", + lock, exp, ecl->ecl_loop, + cfs_atomic_read(&hs->hs_count)); + } + + return 0; } void ldlm_cancel_locks_for_export(struct obd_export *exp) { - lustre_hash_for_each_empty(exp->exp_lock_hash, - ldlm_cancel_locks_for_export_cb, exp); + struct export_cl_data ecl = { + .ecl_exp = exp, + .ecl_loop = 0, + }; + + cfs_hash_for_each_empty(exp->exp_lock_hash, + ldlm_cancel_locks_for_export_cb, &ecl); } /** @@ -1691,7 +1941,6 @@ void ldlm_cancel_locks_for_export(struct obd_export *exp) */ void ldlm_lock_downgrade(struct ldlm_lock *lock, int new_mode) { - struct ldlm_namespace *ns; ENTRY; LASSERT(lock->l_granted_mode & (LCK_PW | LCK_EX)); @@ -1703,8 +1952,7 @@ void ldlm_lock_downgrade(struct ldlm_lock *lock, int new_mode) * Remove the lock from pool as it will be added again in * ldlm_grant_lock() called below. */ - ns = lock->l_resource->lr_namespace; - ldlm_pool_del(&ns->ns_pool, lock); + ldlm_pool_del(&ldlm_lock_to_ns(lock)->ns_pool, lock); lock->l_req_mode = new_mode; ldlm_grant_lock(lock, NULL); @@ -1713,6 +1961,7 @@ void ldlm_lock_downgrade(struct ldlm_lock *lock, int new_mode) EXIT; } +EXPORT_SYMBOL(ldlm_lock_downgrade); struct ldlm_resource *ldlm_lock_convert(struct ldlm_lock *lock, int new_mode, __u32 *flags) @@ -1721,9 +1970,10 @@ struct ldlm_resource *ldlm_lock_convert(struct ldlm_lock *lock, int new_mode, struct ldlm_resource *res; struct ldlm_namespace *ns; int granted = 0; - int old_mode, rc; - struct sl_insert_point prev; - ldlm_error_t err; +#ifdef HAVE_SERVER_SUPPORT + int old_mode; + struct sl_insert_point prev; +#endif struct ldlm_interval *node; ENTRY; @@ -1744,17 +1994,21 @@ struct ldlm_resource *ldlm_lock_convert(struct ldlm_lock *lock, int new_mode, lock_res_and_lock(lock); res = lock->l_resource; - ns = res->lr_namespace; + ns = ldlm_res_to_ns(res); - old_mode = lock->l_req_mode; - lock->l_req_mode = new_mode; - if (res->lr_type == LDLM_PLAIN || res->lr_type == LDLM_IBITS) { - /* remember the lock position where the lock might be - * added back to the granted list later and also - * remember the join mode for skiplist fixing. */ - prev.res_link = lock->l_res_link.prev; - prev.mode_link = lock->l_sl_mode.prev; - prev.policy_link = lock->l_sl_policy.prev; +#ifdef HAVE_SERVER_SUPPORT + old_mode = lock->l_req_mode; +#endif + lock->l_req_mode = new_mode; + if (res->lr_type == LDLM_PLAIN || res->lr_type == LDLM_IBITS) { +#ifdef HAVE_SERVER_SUPPORT + /* remember the lock position where the lock might be + * added back to the granted list later and also + * remember the join mode for skiplist fixing. */ + prev.res_link = lock->l_res_link.prev; + prev.mode_link = lock->l_sl_mode.prev; + prev.policy_link = lock->l_sl_policy.prev; +#endif ldlm_resource_unlink_lock(lock); } else { ldlm_resource_unlink_lock(lock); @@ -1775,7 +2029,7 @@ struct ldlm_resource *ldlm_lock_convert(struct ldlm_lock *lock, int new_mode, ldlm_pool_del(&ns->ns_pool, lock); /* If this is a local resource, put it on the appropriate list. */ - if (ns_is_client(res->lr_namespace)) { + if (ns_is_client(ldlm_res_to_ns(res))) { if (*flags & (LDLM_FL_BLOCK_CONV | LDLM_FL_BLOCK_GRANTED)) { ldlm_resource_add_lock(res, &res->lr_converting, lock); } else { @@ -1787,11 +2041,14 @@ struct ldlm_resource *ldlm_lock_convert(struct ldlm_lock *lock, int new_mode, ldlm_grant_lock(lock, &rpc_list); granted = 1; - /* FIXME: completion handling not with ns_lock held ! */ + /* FIXME: completion handling not with lr_lock held ! */ if (lock->l_completion_ast) lock->l_completion_ast(lock, 0, NULL); } +#ifdef HAVE_SERVER_SUPPORT } else { + int rc; + ldlm_error_t err; int pflags = 0; ldlm_processing_policy policy; policy = ldlm_processing_policy_table[res->lr_type]; @@ -1809,69 +2066,22 @@ struct ldlm_resource *ldlm_lock_convert(struct ldlm_lock *lock, int new_mode, granted = 1; } } +#else + } else { + CERROR("This is client-side-only module, cannot handle " + "LDLM_NAMESPACE_SERVER resource type lock.\n"); + LBUG(); + } +#endif unlock_res_and_lock(lock); if (granted) - ldlm_run_ast_work(&rpc_list, LDLM_WORK_CP_AST); + ldlm_run_ast_work(ns, &rpc_list, LDLM_WORK_CP_AST); if (node) OBD_SLAB_FREE(node, ldlm_interval_slab, sizeof(*node)); RETURN(res); } - -void ldlm_lock_dump(int level, struct ldlm_lock *lock, int pos) -{ - struct obd_device *obd = NULL; - - if (!((libcfs_debug | D_ERROR) & level)) - return; - - if (!lock) { - CDEBUG(level, " NULL LDLM lock\n"); - return; - } - - CDEBUG(level," -- Lock dump: %p/"LPX64" (rc: %d) (pos: %d) (pid: %d)\n", - lock, lock->l_handle.h_cookie, atomic_read(&lock->l_refc), - pos, lock->l_pid); - if (lock->l_conn_export != NULL) - obd = lock->l_conn_export->exp_obd; - if (lock->l_export && lock->l_export->exp_connection) { - CDEBUG(level, " Node: NID %s (rhandle: "LPX64")\n", - libcfs_nid2str(lock->l_export->exp_connection->c_peer.nid), - lock->l_remote_handle.cookie); - } else if (obd == NULL) { - CDEBUG(level, " Node: local\n"); - } else { - struct obd_import *imp = obd->u.cli.cl_import; - CDEBUG(level, " Node: NID %s (rhandle: "LPX64")\n", - libcfs_nid2str(imp->imp_connection->c_peer.nid), - lock->l_remote_handle.cookie); - } - CDEBUG(level, " Resource: %p ("LPU64"/"LPU64"/"LPU64")\n", - lock->l_resource, - lock->l_resource->lr_name.name[0], - lock->l_resource->lr_name.name[1], - lock->l_resource->lr_name.name[2]); - CDEBUG(level, " Req mode: %s, grant mode: %s, rc: %u, read: %d, " - "write: %d flags: "LPX64"\n", ldlm_lockname[lock->l_req_mode], - ldlm_lockname[lock->l_granted_mode], - atomic_read(&lock->l_refc), lock->l_readers, lock->l_writers, - lock->l_flags); - if (lock->l_resource->lr_type == LDLM_EXTENT) - CDEBUG(level, " Extent: "LPU64" -> "LPU64 - " (req "LPU64"-"LPU64")\n", - lock->l_policy_data.l_extent.start, - lock->l_policy_data.l_extent.end, - lock->l_req_extent.start, lock->l_req_extent.end); - else if (lock->l_resource->lr_type == LDLM_FLOCK) - CDEBUG(level, " Pid: %d Extent: "LPU64" -> "LPU64"\n", - lock->l_policy_data.l_flock.pid, - lock->l_policy_data.l_flock.start, - lock->l_policy_data.l_flock.end); - else if (lock->l_resource->lr_type == LDLM_IBITS) - CDEBUG(level, " Bits: "LPX64"\n", - lock->l_policy_data.l_inodebits.bits); -} +EXPORT_SYMBOL(ldlm_lock_convert); void ldlm_lock_dump_handle(int level, struct lustre_handle *lockh) { @@ -1884,132 +2094,134 @@ void ldlm_lock_dump_handle(int level, struct lustre_handle *lockh) if (lock == NULL) return; - ldlm_lock_dump(D_OTHER, lock, 0); + LDLM_DEBUG_LIMIT(level, lock, "###"); LDLM_LOCK_PUT(lock); } +EXPORT_SYMBOL(ldlm_lock_dump_handle); -void _ldlm_lock_debug(struct ldlm_lock *lock, __u32 level, - struct libcfs_debug_msg_data *data, const char *fmt, - ...) +void _ldlm_lock_debug(struct ldlm_lock *lock, + struct libcfs_debug_msg_data *msgdata, + const char *fmt, ...) { va_list args; - cfs_debug_limit_state_t *cdls = data->msg_cdls; + struct obd_export *exp = lock->l_export; + struct ldlm_resource *resource = lock->l_resource; + char *nid = "local"; va_start(args, fmt); - if (lock->l_resource == NULL) { - libcfs_debug_vmsg2(cdls, data->msg_subsys, level,data->msg_file, - data->msg_fn, data->msg_line, fmt, args, + if (exp && exp->exp_connection) { + nid = libcfs_nid2str(exp->exp_connection->c_peer.nid); + } else if (exp && exp->exp_obd != NULL) { + struct obd_import *imp = exp->exp_obd->u.cli.cl_import; + nid = libcfs_nid2str(imp->imp_connection->c_peer.nid); + } + + if (resource == NULL) { + libcfs_debug_vmsg2(msgdata, fmt, args, " ns: \?\? lock: %p/"LPX64" lrc: %d/%d,%d mode: %s/%s " - "res: \?\? rrc=\?\? type: \?\?\? flags: "LPX64" remote: " - LPX64" expref: %d pid: %u timeout: %lu\n", lock, - lock->l_handle.h_cookie, atomic_read(&lock->l_refc), + "res: \?\? rrc=\?\? type: \?\?\? flags: "LPX64" nid: %s " + "remote: "LPX64" expref: %d pid: %u timeout: %lu\n", + lock, + lock->l_handle.h_cookie, cfs_atomic_read(&lock->l_refc), lock->l_readers, lock->l_writers, ldlm_lockname[lock->l_granted_mode], ldlm_lockname[lock->l_req_mode], - lock->l_flags, lock->l_remote_handle.cookie, - lock->l_export ? - atomic_read(&lock->l_export->exp_refcount) : -99, + lock->l_flags, nid, lock->l_remote_handle.cookie, + exp ? cfs_atomic_read(&exp->exp_refcount) : -99, lock->l_pid, lock->l_callback_timeout); va_end(args); return; } - switch (lock->l_resource->lr_type) { + switch (resource->lr_type) { case LDLM_EXTENT: - libcfs_debug_vmsg2(cdls, data->msg_subsys, level,data->msg_file, - data->msg_fn, data->msg_line, fmt, args, + libcfs_debug_vmsg2(msgdata, fmt, args, " ns: %s lock: %p/"LPX64" lrc: %d/%d,%d mode: %s/%s " "res: "LPU64"/"LPU64" rrc: %d type: %s ["LPU64"->"LPU64 - "] (req "LPU64"->"LPU64") flags: "LPX64" remote: "LPX64 - " expref: %d pid: %u timeout %lu\n", - lock->l_resource->lr_namespace->ns_name, lock, - lock->l_handle.h_cookie, atomic_read(&lock->l_refc), + "] (req "LPU64"->"LPU64") flags: "LPX64" nid: %s remote:" + " "LPX64" expref: %d pid: %u timeout %lu\n", + ldlm_lock_to_ns_name(lock), lock, + lock->l_handle.h_cookie, cfs_atomic_read(&lock->l_refc), lock->l_readers, lock->l_writers, ldlm_lockname[lock->l_granted_mode], ldlm_lockname[lock->l_req_mode], - lock->l_resource->lr_name.name[0], - lock->l_resource->lr_name.name[1], - atomic_read(&lock->l_resource->lr_refcount), - ldlm_typename[lock->l_resource->lr_type], + resource->lr_name.name[0], + resource->lr_name.name[1], + cfs_atomic_read(&resource->lr_refcount), + ldlm_typename[resource->lr_type], lock->l_policy_data.l_extent.start, lock->l_policy_data.l_extent.end, lock->l_req_extent.start, lock->l_req_extent.end, - lock->l_flags, lock->l_remote_handle.cookie, - lock->l_export ? - atomic_read(&lock->l_export->exp_refcount) : -99, + lock->l_flags, nid, lock->l_remote_handle.cookie, + exp ? cfs_atomic_read(&exp->exp_refcount) : -99, lock->l_pid, lock->l_callback_timeout); break; case LDLM_FLOCK: - libcfs_debug_vmsg2(cdls, data->msg_subsys, level,data->msg_file, - data->msg_fn, data->msg_line, fmt, args, + libcfs_debug_vmsg2(msgdata, fmt, args, " ns: %s lock: %p/"LPX64" lrc: %d/%d,%d mode: %s/%s " "res: "LPU64"/"LPU64" rrc: %d type: %s pid: %d " - "["LPU64"->"LPU64"] flags: "LPX64" remote: "LPX64 + "["LPU64"->"LPU64"] flags: "LPX64" nid: %s remote: "LPX64 " expref: %d pid: %u timeout: %lu\n", - lock->l_resource->lr_namespace->ns_name, lock, - lock->l_handle.h_cookie, atomic_read(&lock->l_refc), + ldlm_lock_to_ns_name(lock), lock, + lock->l_handle.h_cookie, cfs_atomic_read(&lock->l_refc), lock->l_readers, lock->l_writers, ldlm_lockname[lock->l_granted_mode], ldlm_lockname[lock->l_req_mode], - lock->l_resource->lr_name.name[0], - lock->l_resource->lr_name.name[1], - atomic_read(&lock->l_resource->lr_refcount), - ldlm_typename[lock->l_resource->lr_type], + resource->lr_name.name[0], + resource->lr_name.name[1], + cfs_atomic_read(&resource->lr_refcount), + ldlm_typename[resource->lr_type], lock->l_policy_data.l_flock.pid, lock->l_policy_data.l_flock.start, lock->l_policy_data.l_flock.end, - lock->l_flags, lock->l_remote_handle.cookie, - lock->l_export ? - atomic_read(&lock->l_export->exp_refcount) : -99, + lock->l_flags, nid, lock->l_remote_handle.cookie, + exp ? cfs_atomic_read(&exp->exp_refcount) : -99, lock->l_pid, lock->l_callback_timeout); break; case LDLM_IBITS: - libcfs_debug_vmsg2(cdls, data->msg_subsys, level,data->msg_file, - data->msg_fn, data->msg_line, fmt, args, + libcfs_debug_vmsg2(msgdata, fmt, args, " ns: %s lock: %p/"LPX64" lrc: %d/%d,%d mode: %s/%s " "res: "LPU64"/"LPU64" bits "LPX64" rrc: %d type: %s " - "flags: "LPX64" remote: "LPX64" expref: %d " + "flags: "LPX64" nid: %s remote: "LPX64" expref: %d " "pid: %u timeout: %lu\n", - lock->l_resource->lr_namespace->ns_name, + ldlm_lock_to_ns_name(lock), lock, lock->l_handle.h_cookie, - atomic_read (&lock->l_refc), + cfs_atomic_read (&lock->l_refc), lock->l_readers, lock->l_writers, ldlm_lockname[lock->l_granted_mode], ldlm_lockname[lock->l_req_mode], - lock->l_resource->lr_name.name[0], - lock->l_resource->lr_name.name[1], + resource->lr_name.name[0], + resource->lr_name.name[1], lock->l_policy_data.l_inodebits.bits, - atomic_read(&lock->l_resource->lr_refcount), - ldlm_typename[lock->l_resource->lr_type], - lock->l_flags, lock->l_remote_handle.cookie, - lock->l_export ? - atomic_read(&lock->l_export->exp_refcount) : -99, + cfs_atomic_read(&resource->lr_refcount), + ldlm_typename[resource->lr_type], + lock->l_flags, nid, lock->l_remote_handle.cookie, + exp ? cfs_atomic_read(&exp->exp_refcount) : -99, lock->l_pid, lock->l_callback_timeout); break; default: - libcfs_debug_vmsg2(cdls, data->msg_subsys, level,data->msg_file, - data->msg_fn, data->msg_line, fmt, args, + libcfs_debug_vmsg2(msgdata, fmt, args, " ns: %s lock: %p/"LPX64" lrc: %d/%d,%d mode: %s/%s " "res: "LPU64"/"LPU64" rrc: %d type: %s flags: "LPX64" " - "remote: "LPX64" expref: %d pid: %u timeout %lu\n", - lock->l_resource->lr_namespace->ns_name, + "nid: %s remote: "LPX64" expref: %d pid: %u timeout %lu" + "\n", + ldlm_lock_to_ns_name(lock), lock, lock->l_handle.h_cookie, - atomic_read (&lock->l_refc), + cfs_atomic_read (&lock->l_refc), lock->l_readers, lock->l_writers, ldlm_lockname[lock->l_granted_mode], ldlm_lockname[lock->l_req_mode], - lock->l_resource->lr_name.name[0], - lock->l_resource->lr_name.name[1], - atomic_read(&lock->l_resource->lr_refcount), - ldlm_typename[lock->l_resource->lr_type], - lock->l_flags, lock->l_remote_handle.cookie, - lock->l_export ? - atomic_read(&lock->l_export->exp_refcount) : -99, + resource->lr_name.name[0], + resource->lr_name.name[1], + cfs_atomic_read(&resource->lr_refcount), + ldlm_typename[resource->lr_type], + lock->l_flags, nid, lock->l_remote_handle.cookie, + exp ? cfs_atomic_read(&exp->exp_refcount) : -99, lock->l_pid, lock->l_callback_timeout); break; }