-/* -*- 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.
/*
* 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/
#ifdef __KERNEL__
# include <libcfs/libcfs.h>
-# ifndef HAVE_VFS_INTENT_PATCHES
# include <linux/lustre_intent.h>
-# endif
#else
# include <liblustre.h>
#endif
[LCK_GROUP] "GROUP",
[LCK_COS] "COS"
};
+EXPORT_SYMBOL(ldlm_lockname);
char *ldlm_typename[] = {
[LDLM_PLAIN] "PLN",
[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)
{
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,
};
{
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
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)
{
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)
{
if (lock->l_readers || lock->l_writers) {
LDLM_ERROR(lock, "lock still has references");
- ldlm_lock_dump(D_ERROR, lock, 0);
LBUG();
}
if (!cfs_list_empty(&lock->l_res_link)) {
LDLM_ERROR(lock, "lock still on resource");
- ldlm_lock_dump(D_ERROR, lock, 0);
LBUG();
}
}
lock->l_destroyed = 1;
- if (lock->l_export && lock->l_export->exp_lock_hash &&
- !cfs_hlist_unhashed(&lock->l_exp_hash))
- cfs_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);
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
* new lock will take over the refcount.
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);
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);
lu_ref_init(&lock->l_reference);
lu_ref_add(&lock->l_reference, "hash", lock);
lock->l_exp_refs_nr = 0;
lock->l_exp_refs_target = NULL;
#endif
+ CFS_INIT_LIST_HEAD(&lock->l_exp_list);
RETURN(lock);
}
RETURN(0);
}
+EXPORT_SYMBOL(ldlm_lock_change_resource);
/*
* HANDLES
{
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
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);
if (lock == NULL)
RETURN(NULL);
- LASSERT(lock->l_resource != NULL);
- ns = ldlm_lock_to_ns(lock);
- 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)
{
/* 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);
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,
cfs_list_t *work_list)
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)
{
}
return result;
}
+EXPORT_SYMBOL(ldlm_lock_addref_try);
/* only called for local locks */
void ldlm_lock_addref_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);
!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);
}
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. */
ldlm_lock_decref_internal(lock, mode);
LDLM_LOCK_PUT(lock);
}
+EXPORT_SYMBOL(ldlm_lock_decref_and_cancel);
struct sl_insert_point {
cfs_list_t *res_link;
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");
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) &&
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)
{
ldlm_lock_allow_match_locked(lock);
unlock_res_and_lock(lock);
}
+EXPORT_SYMBOL(ldlm_lock_allow_match);
/* Can be called in two ways:
*
/* 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:
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,
lock->l_req_mode = mode;
lock->l_ast_data = data;
lock->l_pid = cfs_curproc_pid();
- lock->l_ns_srv = ns_is_server(ns);
+ lock->l_ns_srv = !!ns_is_server(ns);
if (cbs) {
lock->l_blocking_ast = cbs->lcs_blocking;
lock->l_completion_ast = cbs->lcs_completion;
struct ldlm_lock *lock = *lockp;
struct ldlm_resource *res = lock->l_resource;
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;
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);
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)
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, cfs_list_t *queue,
cfs_list_t *work_list)
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(cfs_list_t *tmp, struct ldlm_cb_set_arg *arg)
-{
- struct ldlm_lock_desc d;
- struct ldlm_lock *lock = cfs_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);
- cfs_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);
-
- 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);
+ 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);
- RETURN(1);
+ RETURN(rc);
}
static int
-ldlm_work_cp_ast_lock(cfs_list_t *tmp, struct ldlm_cb_set_arg *arg)
+ldlm_work_cp_ast_lock(struct ptlrpc_request_set *rqset, void *opaq)
{
- struct ldlm_lock *lock = cfs_list_entry(tmp, struct ldlm_lock, l_cp_ast);
- ldlm_completion_callback completion_callback;
- int rc = 0;
- 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. */
-
- /* 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) {
- completion_callback(lock, 0, (void *)arg);
- rc = 1;
- }
- LDLM_LOCK_RELEASE(lock);
-
- RETURN(rc);
+ 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_revoke_ast_lock(cfs_list_t *tmp, struct ldlm_cb_set_arg *arg)
+ldlm_work_revoke_ast_lock(struct ptlrpc_request_set *rqset, void *opaq)
{
- struct ldlm_lock_desc desc;
- struct ldlm_lock *lock = cfs_list_entry(tmp, struct ldlm_lock,
- l_rk_ast);
- ENTRY;
+ struct ldlm_cb_set_arg *arg = opaq;
+ struct ldlm_lock_desc desc;
+ int rc;
+ struct ldlm_lock *lock;
+ ENTRY;
- cfs_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;
+ lock = cfs_list_entry(arg->list->next, struct ldlm_lock, l_rk_ast);
+ cfs_list_del_init(&lock->l_rk_ast);
- lock->l_blocking_ast(lock, &desc, (void*)arg, LDLM_CB_BLOCKING);
- 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;
+
+ rc = lock->l_blocking_ast(lock, &desc, (void*)arg, LDLM_CB_BLOCKING);
+ LDLM_LOCK_RELEASE(lock);
- RETURN(1);
+ RETURN(rc);
}
-int ldlm_run_ast_work(cfs_list_t *rpc_list, ldlm_desc_ast_t ast_type)
+int ldlm_work_gl_ast_lock(struct ptlrpc_request_set *rqset, void *opaq)
{
- struct ldlm_cb_set_arg arg;
- cfs_list_t *tmp, *pos;
- int (*work_ast_lock)(cfs_list_t *tmp, struct ldlm_cb_set_arg *arg);
- int ast_count;
- ENTRY;
+ struct ldlm_cb_set_arg *arg = opaq;
+ struct ldlm_glimpse_work *gl_work;
+ struct ldlm_lock *lock;
+ int rc = 0;
+ ENTRY;
- if (cfs_list_empty(rpc_list))
- RETURN(0);
+ if (cfs_list_empty(arg->list))
+ RETURN(-ENOENT);
- arg.set = ptlrpc_prep_set();
- if (NULL == arg.set)
- RETURN(-ERESTART);
- cfs_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();
- }
+ gl_work = cfs_list_entry(arg->list->next, struct ldlm_glimpse_work,
+ gl_list);
+ cfs_list_del_init(&gl_work->gl_list);
- ast_count = 0;
- cfs_list_for_each_safe(tmp, pos, rpc_list) {
- ast_count += work_ast_lock(tmp, &arg);
+ lock = gl_work->gl_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;
- }
- }
+ /* transfer the glimpse descriptor to ldlm_cb_set_arg */
+ arg->gl_desc = gl_work->gl_desc;
- 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);
+ /* invoke the actual glimpse callback */
+ if (lock->l_glimpse_ast(lock, (void*)arg) == 0)
+ rc = 1;
+
+ LDLM_LOCK_RELEASE(lock);
+
+ if ((gl_work->gl_flags & LDLM_GL_WORK_NOFREE) == 0)
+ OBD_FREE_PTR(gl_work);
+
+ RETURN(rc);
+}
- RETURN(cfs_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)
}
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(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(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;
}
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);
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)
{
- struct obd_export *exp = data;
+ 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;
ldlm_reprocess_all(res);
ldlm_resource_putref(res);
LDLM_LOCK_RELEASE(lock);
- return 0;
+
+ 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)
{
- cfs_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);
}
/**
EXIT;
}
+EXPORT_SYMBOL(ldlm_lock_downgrade);
struct ldlm_resource *ldlm_lock_convert(struct ldlm_lock *lock, int new_mode,
__u32 *flags)
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;
res = lock->l_resource;
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);
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];
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, cfs_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],
- cfs_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)
{
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,
+ "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 ?
- cfs_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",
+ "] (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],
- cfs_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 ?
- cfs_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",
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],
- cfs_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 ?
- cfs_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",
ldlm_lock_to_ns_name(lock),
lock, lock->l_handle.h_cookie,
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,
- cfs_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 ?
- cfs_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",
+ "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],
- cfs_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 ?
- cfs_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;
}
git://git.whamcloud.com / fs / lustre-release.git / blobdiff