X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Fldlm%2Fldlm_internal.h;h=aa0faef42c67091b0b9c026bdcf9d51bdb7ed020;hp=cbad123e66890c9e60d1277c7d3370a1846ba1a5;hb=7d3723d80078c0852b9511523960ba5f4590643c;hpb=ef6d296d337b34a08c9d76f63b747ce97881ac61 diff --git a/lustre/ldlm/ldlm_internal.h b/lustre/ldlm/ldlm_internal.h index cbad123..aa0faef 100644 --- a/lustre/ldlm/ldlm_internal.h +++ b/lustre/ldlm/ldlm_internal.h @@ -28,6 +28,9 @@ /* * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. * Use is subject to license terms. + * + * Copyright (c) 2011 Whamcloud, Inc. + * */ /* * This file is part of Lustre, http://www.lustre.org/ @@ -43,6 +46,12 @@ extern cfs_list_t ldlm_srv_namespace_list; extern cfs_semaphore_t ldlm_cli_namespace_lock; extern cfs_list_t ldlm_cli_namespace_list; +static inline int ldlm_res_eq(const struct ldlm_res_id *res0, + const struct ldlm_res_id *res1) +{ + return !memcmp(res0, res1, sizeof(*res0)); +} + static inline cfs_atomic_t *ldlm_namespace_nr(ldlm_side_t client) { return client == LDLM_NAMESPACE_SERVER ? @@ -72,7 +81,9 @@ enum { LDLM_CANCEL_AGED = 1 << 0, /* Cancel aged locks (non lru resize). */ LDLM_CANCEL_PASSED = 1 << 1, /* Cancel passed number of locks. */ LDLM_CANCEL_SHRINK = 1 << 2, /* Cancel locks from shrinker. */ - LDLM_CANCEL_LRUR = 1 << 3 /* Cancel locks from lru resize. */ + LDLM_CANCEL_LRUR = 1 << 3, /* Cancel locks from lru resize. */ + LDLM_CANCEL_NO_WAIT = 1 << 4 /* Cancel locks w/o blocking (neither + * sending nor waiting for any rpcs) */ }; int ldlm_cancel_lru(struct ldlm_namespace *ns, int nr, ldlm_sync_t sync, @@ -92,16 +103,24 @@ void ldlm_namespace_free_prior(struct ldlm_namespace *ns, void ldlm_namespace_free_post(struct ldlm_namespace *ns); /* ldlm_lock.c */ -/* Number of blocking/completion callbacks that will be sent in - * parallel (see bug 11301). */ -#define PARALLEL_AST_LIMIT 200 - struct ldlm_cb_set_arg { - struct ptlrpc_request_set *set; + int type; /* LDLM_BL_CALLBACK or LDLM_CP_CALLBACK */ + unsigned int threshold; /* threshold to wake up the waiting proc */ + cfs_atomic_t rpcs; /* # of inflight rpcs in set */ cfs_atomic_t restart; - __u32 type; /* LDLM_BL_CALLBACK or LDLM_CP_CALLBACK */ + cfs_atomic_t refcount; + cfs_waitq_t waitq; }; +static inline void ldlm_csa_put(struct ldlm_cb_set_arg *arg) +{ + if (cfs_atomic_dec_and_test(&arg->refcount)) { + LASSERT(cfs_atomic_read(&arg->rpcs) == 0); + + OBD_FREE_PTR(arg); + } +} + typedef enum { LDLM_WORK_BL_AST, LDLM_WORK_CP_AST, @@ -124,7 +143,8 @@ void ldlm_add_ast_work_item(struct ldlm_lock *lock, struct ldlm_lock *new, cfs_list_t *work_list); int ldlm_reprocess_queue(struct ldlm_resource *res, cfs_list_t *queue, cfs_list_t *work_list); -int ldlm_run_ast_work(cfs_list_t *rpc_list, ldlm_desc_ast_t ast_type); +int ldlm_run_ast_work(struct ldlm_namespace *ns, cfs_list_t *rpc_list, + ldlm_desc_ast_t ast_type); int ldlm_lock_remove_from_lru(struct ldlm_lock *lock); int ldlm_lock_remove_from_lru_nolock(struct ldlm_lock *lock); void ldlm_lock_add_to_lru_nolock(struct ldlm_lock *lock); @@ -138,7 +158,7 @@ void ldlm_cancel_locks_for_export(struct obd_export *export); int ldlm_bl_to_thread_lock(struct ldlm_namespace *ns, struct ldlm_lock_desc *ld, struct ldlm_lock *lock); int ldlm_bl_to_thread_list(struct ldlm_namespace *ns, struct ldlm_lock_desc *ld, - cfs_list_t *cancels, int count); + cfs_list_t *cancels, int count, int mode); void ldlm_handle_bl_callback(struct ldlm_namespace *ns, struct ldlm_lock_desc *ld, struct ldlm_lock *lock); @@ -200,7 +220,8 @@ void ldlm_exit(void); enum ldlm_policy_res { LDLM_POLICY_CANCEL_LOCK, - LDLM_POLICY_KEEP_LOCK + LDLM_POLICY_KEEP_LOCK, + LDLM_POLICY_SKIP_LOCK }; typedef enum ldlm_policy_res ldlm_policy_res_t; @@ -249,9 +270,32 @@ static inline int is_granted_or_cancelled(struct ldlm_lock *lock) lock_res_and_lock(lock); if (((lock->l_req_mode == lock->l_granted_mode) && !(lock->l_flags & LDLM_FL_CP_REQD)) || - (lock->l_flags & LDLM_FL_FAILED)) + (lock->l_flags & (LDLM_FL_FAILED | LDLM_FL_CANCEL))) ret = 1; unlock_res_and_lock(lock); return ret; } + +typedef void (*ldlm_policy_wire_to_local_t)(const ldlm_wire_policy_data_t *, + ldlm_policy_data_t *); + +typedef void (*ldlm_policy_local_to_wire_t)(const ldlm_policy_data_t *, + ldlm_wire_policy_data_t *); + +void ldlm_plain_policy_wire_to_local(const ldlm_wire_policy_data_t *wpolicy, + ldlm_policy_data_t *lpolicy); +void ldlm_plain_policy_local_to_wire(const ldlm_policy_data_t *lpolicy, + ldlm_wire_policy_data_t *wpolicy); +void ldlm_ibits_policy_wire_to_local(const ldlm_wire_policy_data_t *wpolicy, + ldlm_policy_data_t *lpolicy); +void ldlm_ibits_policy_local_to_wire(const ldlm_policy_data_t *lpolicy, + ldlm_wire_policy_data_t *wpolicy); +void ldlm_extent_policy_wire_to_local(const ldlm_wire_policy_data_t *wpolicy, + ldlm_policy_data_t *lpolicy); +void ldlm_extent_policy_local_to_wire(const ldlm_policy_data_t *lpolicy, + ldlm_wire_policy_data_t *wpolicy); +void ldlm_flock_policy_wire_to_local(const ldlm_wire_policy_data_t *wpolicy, + ldlm_policy_data_t *lpolicy); +void ldlm_flock_policy_local_to_wire(const ldlm_policy_data_t *lpolicy, + ldlm_wire_policy_data_t *wpolicy);