/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
* vim:expandtab:shiftwidth=8:tabstop=8:
*
- * Copyright (C) 2002 Cluster File Systems, Inc.
+ * Copyright (C) 2002, 2003 Cluster File Systems, Inc.
+ * Author: Phil Schwan <phil@clusterfs.com>
+ * Author: Peter Braam <braam@clusterfs.com>
*
- * This code is issued under the GNU General Public License.
- * See the file COPYING in this distribution
+ * This file is part of Lustre, http://www.lustre.org.
*
- * by Cluster File Systems, Inc.
+ * Lustre is free software; you can redistribute it and/or
+ * modify it under the terms of version 2 of the GNU General Public
+ * License as published by the Free Software Foundation.
+ *
+ * Lustre is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Lustre; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-#define EXPORT_SYMTAB
#define DEBUG_SUBSYSTEM S_LDLM
+#ifdef __KERNEL__
+# include <linux/lustre_dlm.h>
+#else
+# include <liblustre.h>
+#endif
-#include <linux/slab.h>
-#include <linux/lustre_dlm.h>
+#include <linux/obd_class.h>
+#include "ldlm_internal.h"
kmem_cache_t *ldlm_resource_slab, *ldlm_lock_slab;
-struct list_head ldlm_namespaces;
-spinlock_t ldlm_spinlock;
+spinlock_t ldlm_namespace_lock = SPIN_LOCK_UNLOCKED;
+struct list_head ldlm_namespace_list = LIST_HEAD_INIT(ldlm_namespace_list);
+struct proc_dir_entry *ldlm_type_proc_dir = NULL;
+struct proc_dir_entry *ldlm_ns_proc_dir = NULL;
+struct proc_dir_entry *ldlm_svc_proc_dir = NULL;
-struct ldlm_namespace *ldlm_namespace_find(__u32 id)
+#ifdef __KERNEL__
+static int ldlm_proc_dump_ns(struct file *file, const char *buffer, unsigned long count, void *data)
{
- struct list_head *tmp;
- struct ldlm_namespace *res;
-
- res = NULL;
- list_for_each(tmp, &ldlm_namespaces) {
- struct ldlm_namespace *chk;
- chk = list_entry(tmp, struct ldlm_namespace, ns_link);
-
- if ( chk->ns_id == id ) {
- res = chk;
- break;
- }
+ ldlm_dump_all_namespaces();
+ RETURN(count);
+}
+
+int ldlm_proc_setup(void)
+{
+ int rc;
+ struct lprocfs_vars list[] = {
+ { "dump_namespaces", NULL, ldlm_proc_dump_ns, NULL },
+ { NULL }};
+ ENTRY;
+ LASSERT(ldlm_ns_proc_dir == NULL);
+
+ ldlm_type_proc_dir = lprocfs_register(OBD_LDLM_DEVICENAME,
+ proc_lustre_root,
+ NULL, NULL);
+ if (IS_ERR(ldlm_type_proc_dir)) {
+ CERROR("LProcFS failed in ldlm-init\n");
+ rc = PTR_ERR(ldlm_type_proc_dir);
+ GOTO(err, rc);
}
- return res;
+ ldlm_ns_proc_dir = lprocfs_register("namespaces",
+ ldlm_type_proc_dir,
+ NULL, NULL);
+ if (IS_ERR(ldlm_ns_proc_dir)) {
+ CERROR("LProcFS failed in ldlm-init\n");
+ rc = PTR_ERR(ldlm_ns_proc_dir);
+ GOTO(err_type, rc);
+ }
+
+ ldlm_svc_proc_dir = lprocfs_register("services",
+ ldlm_type_proc_dir,
+ NULL, NULL);
+ if (IS_ERR(ldlm_svc_proc_dir)) {
+ CERROR("LProcFS failed in ldlm-init\n");
+ rc = PTR_ERR(ldlm_svc_proc_dir);
+ GOTO(err_ns, rc);
+ }
+
+ rc = lprocfs_add_vars(ldlm_type_proc_dir, list, NULL);
+
+ RETURN(0);
+
+err_ns:
+ lprocfs_remove(ldlm_ns_proc_dir);
+err_type:
+ lprocfs_remove(ldlm_type_proc_dir);
+err:
+ ldlm_type_proc_dir = NULL;
+ ldlm_ns_proc_dir = NULL;
+ ldlm_svc_proc_dir = NULL;
+ RETURN(rc);
}
-/* this must be called with ldlm_lock() held */
-static void res_hash_init(struct ldlm_namespace *ns)
+void ldlm_proc_cleanup(void)
{
- struct list_head *res_hash;
- struct list_head *bucket;
+ if (ldlm_svc_proc_dir) {
+ lprocfs_remove(ldlm_svc_proc_dir);
+ ldlm_svc_proc_dir = NULL;
+ }
- if (ns->ns_hash != NULL)
- return;
+ if (ldlm_ns_proc_dir) {
+ lprocfs_remove(ldlm_ns_proc_dir);
+ ldlm_ns_proc_dir = NULL;
+ }
- /* FIXME: this memory appears to be leaked */
- OBD_ALLOC(res_hash, sizeof(*res_hash) * RES_HASH_SIZE);
- if (!res_hash)
- LBUG();
+ if (ldlm_type_proc_dir) {
+ lprocfs_remove(ldlm_type_proc_dir);
+ ldlm_type_proc_dir = NULL;
+ }
+}
- for (bucket = res_hash + RES_HASH_SIZE - 1; bucket >= res_hash;
- bucket--)
- INIT_LIST_HEAD(bucket);
+static int lprocfs_uint_rd(char *page, char **start, off_t off,
+ int count, int *eof, void *data)
+{
+ unsigned int *temp = (unsigned int *)data;
+ return snprintf(page, count, "%u\n", *temp);
+}
- ns->ns_hash = res_hash;
+static int lprocfs_read_lru_size(char *page, char **start, off_t off,
+ int count, int *eof, void *data)
+{
+ struct ldlm_namespace *ns = data;
+ return lprocfs_uint_rd(page, start, off, count, eof,
+ &ns->ns_max_unused);
}
-ldlm_error_t ldlm_namespace_new(struct obd_device *obddev, __u32 id,
- struct ldlm_namespace **ns_out)
+#define MAX_STRING_SIZE 128
+static int lprocfs_write_lru_size(struct file *file, const char *buffer,
+ unsigned long count, void *data)
{
- struct ldlm_namespace *ns;
+ struct ldlm_namespace *ns = data;
+ char dummy[MAX_STRING_SIZE + 1];
+ unsigned long tmp;
+
+ dummy[MAX_STRING_SIZE] = '\0';
+ copy_from_user(dummy, buffer, MAX_STRING_SIZE);
+
+ if (count == 6 && memcmp(dummy, "clear", 5) == 0) {
+ CDEBUG(D_DLMTRACE,
+ "dropping all unused locks from namespace %s\n",
+ ns->ns_name);
+ tmp = ns->ns_max_unused;
+ ns->ns_max_unused = 0;
+ ldlm_cancel_lru(ns);
+ ns->ns_max_unused = tmp;
+ return count;
+ }
+
+ tmp = simple_strtoul(dummy, NULL, 0);
+ CDEBUG(D_DLMTRACE, "changing namespace %s max_unused from %u to %u\n",
+ ns->ns_name, ns->ns_max_unused, (unsigned int)tmp);
+ ns->ns_max_unused = (unsigned int)tmp;
- if (ldlm_namespace_find(id))
- return -ELDLM_NAMESPACE_EXISTS;
+ ldlm_cancel_lru(ns);
+
+ return count;
+}
+
+void ldlm_proc_namespace(struct ldlm_namespace *ns)
+{
+ struct lprocfs_vars lock_vars[2];
+ char lock_name[MAX_STRING_SIZE + 1];
+
+ LASSERT(ns != NULL);
+ LASSERT(ns->ns_name != NULL);
+
+ lock_name[MAX_STRING_SIZE] = '\0';
+
+ memset(lock_vars, 0, sizeof(lock_vars));
+ lock_vars[0].read_fptr = lprocfs_rd_u64;
+ lock_vars[0].name = lock_name;
+
+ snprintf(lock_name, MAX_STRING_SIZE, "%s/resource_count", ns->ns_name);
+ lock_vars[0].data = &ns->ns_resources;
+ lprocfs_add_vars(ldlm_ns_proc_dir, lock_vars, 0);
+
+ snprintf(lock_name, MAX_STRING_SIZE, "%s/lock_count", ns->ns_name);
+ lock_vars[0].data = &ns->ns_locks;
+ lprocfs_add_vars(ldlm_ns_proc_dir, lock_vars, 0);
+
+ if (ns->ns_client) {
+ snprintf(lock_name, MAX_STRING_SIZE, "%s/lock_unused_count",
+ ns->ns_name);
+ lock_vars[0].data = &ns->ns_nr_unused;
+ lock_vars[0].read_fptr = lprocfs_uint_rd;
+ lprocfs_add_vars(ldlm_ns_proc_dir, lock_vars, 0);
+
+ snprintf(lock_name, MAX_STRING_SIZE, "%s/lru_size",
+ ns->ns_name);
+ lock_vars[0].data = ns;
+ lock_vars[0].read_fptr = lprocfs_read_lru_size;
+ lock_vars[0].write_fptr = lprocfs_write_lru_size;
+ lprocfs_add_vars(ldlm_ns_proc_dir, lock_vars, 0);
+ }
+}
+#endif
+#undef MAX_STRING_SIZE
+
+struct ldlm_namespace *ldlm_namespace_new(char *name, __u32 client)
+{
+ struct ldlm_namespace *ns = NULL;
+ struct list_head *bucket;
+ int rc;
+ ENTRY;
+
+ rc = ldlm_get_ref();
+ if (rc) {
+ CERROR("ldlm_get_ref failed: %d\n", rc);
+ RETURN(NULL);
+ }
OBD_ALLOC(ns, sizeof(*ns));
if (!ns)
- LBUG();
+ GOTO(out_ref, NULL);
+
+ OBD_VMALLOC(ns->ns_hash, sizeof(*ns->ns_hash) * RES_HASH_SIZE);
+ if (!ns->ns_hash)
+ GOTO(out_ns, NULL);
+
+ OBD_ALLOC(ns->ns_name, strlen(name) + 1);
+ if (!ns->ns_name)
+ GOTO(out_hash, NULL);
+
+ strcpy(ns->ns_name, name);
- ns->ns_id = id;
- ns->ns_obddev = obddev;
INIT_LIST_HEAD(&ns->ns_root_list);
+ l_lock_init(&ns->ns_lock);
+ ns->ns_refcount = 0;
+ ns->ns_client = client;
+ spin_lock_init(&ns->ns_counter_lock);
+ ns->ns_locks = 0;
+ ns->ns_resources = 0;
+
+ for (bucket = ns->ns_hash + RES_HASH_SIZE - 1; bucket >= ns->ns_hash;
+ bucket--)
+ INIT_LIST_HEAD(bucket);
+
+ INIT_LIST_HEAD(&ns->ns_unused_list);
+ ns->ns_nr_unused = 0;
+ ns->ns_max_unused = LDLM_DEFAULT_LRU_SIZE;
+
+ spin_lock(&ldlm_namespace_lock);
+ list_add(&ns->ns_list_chain, &ldlm_namespace_list);
+ spin_unlock(&ldlm_namespace_lock);
+#ifdef __KERNEL__
+ ldlm_proc_namespace(ns);
+#endif
+ RETURN(ns);
+
+out_hash:
+ POISON(ns->ns_hash, 0x5a, sizeof(*ns->ns_hash) * RES_HASH_SIZE);
+ OBD_VFREE(ns->ns_hash, sizeof(*ns->ns_hash) * RES_HASH_SIZE);
+out_ns:
+ OBD_FREE(ns, sizeof(*ns));
+out_ref:
+ ldlm_put_ref(0);
+ RETURN(NULL);
+}
+
+extern struct ldlm_lock *ldlm_lock_get(struct ldlm_lock *lock);
+
+/* If flags contains FL_LOCAL_ONLY, don't try to tell the server, just cleanup.
+ * This is currently only used for recovery, and we make certain assumptions
+ * as a result--notably, that we shouldn't cancel locks with refs. -phil
+ *
+ * Called with the ns_lock held. */
+static void cleanup_resource(struct ldlm_resource *res, struct list_head *q,
+ int flags)
+{
+ struct list_head *tmp, *pos;
+ int rc = 0, client = res->lr_namespace->ns_client;
+ int local_only = (flags & LDLM_FL_LOCAL_ONLY);
+ ENTRY;
+
+ list_for_each_safe(tmp, pos, q) {
+ struct ldlm_lock *lock;
+ lock = list_entry(tmp, struct ldlm_lock, l_res_link);
+ LDLM_LOCK_GET(lock);
+
+ lock->l_flags |= LDLM_FL_CANCEL;
+ lock->l_flags |= flags;
+
+ if (local_only && (lock->l_readers || lock->l_writers)) {
+ /* This is a little bit gross, but much better than the
+ * alternative: pretend that we got a blocking AST from
+ * the server, so that when the lock is decref'd, it
+ * will go away ... */
+ lock->l_flags |= LDLM_FL_CBPENDING;
+ /* ... without sending a CANCEL message. */
+ lock->l_flags |= LDLM_FL_LOCAL_ONLY;
+ LDLM_DEBUG(lock, "setting FL_LOCAL_ONLY");
+ if (lock->l_completion_ast)
+ lock->l_completion_ast(lock, 0, NULL);
+ LDLM_LOCK_PUT(lock);
+ continue;
+ }
+
+ if (client) {
+ struct lustre_handle lockh;
+ ldlm_lock2handle(lock, &lockh);
+ if (!local_only) {
+ rc = ldlm_cli_cancel(&lockh);
+ if (rc)
+ CERROR("ldlm_cli_cancel: %d\n", rc);
+ }
+ /* Force local cleanup on errors, too. */
+ if (local_only || rc != ELDLM_OK)
+ ldlm_lock_cancel(lock);
+ } else {
+ LDLM_DEBUG(lock, "Freeing a lock still held by a "
+ "client node");
+
+ ldlm_resource_unlink_lock(lock);
+ ldlm_lock_destroy(lock);
+ }
+ LDLM_LOCK_PUT(lock);
+ }
+ EXIT;
+}
- list_add(&ns->ns_link, &ldlm_namespaces);
+int ldlm_namespace_cleanup(struct ldlm_namespace *ns, int flags)
+{
+ int i;
- res_hash_init(ns);
- atomic_set(&ns->ns_refcount, 0);
+ if (ns == NULL) {
+ CDEBUG(D_INFO, "NULL ns, skipping cleanup\n");
+ return ELDLM_OK;
+ }
+
+ l_lock(&ns->ns_lock);
+ for (i = 0; i < RES_HASH_SIZE; i++) {
+ struct list_head *tmp, *pos;
+ list_for_each_safe(tmp, pos, &(ns->ns_hash[i])) {
+ struct ldlm_resource *res;
+ res = list_entry(tmp, struct ldlm_resource, lr_hash);
+ ldlm_resource_getref(res);
+
+ cleanup_resource(res, &res->lr_granted, flags);
+ cleanup_resource(res, &res->lr_converting, flags);
+ cleanup_resource(res, &res->lr_waiting, flags);
+
+ /* XXX what a mess: don't force cleanup if we're
+ * local_only (which is only used by recovery). In that
+ * case, we probably still have outstanding lock refs
+ * which reference these resources. -phil */
+ if (!ldlm_resource_putref(res) &&
+ !(flags & LDLM_FL_LOCAL_ONLY)) {
+ CERROR("Resource refcount nonzero (%d) after "
+ "lock cleanup; forcing cleanup.\n",
+ atomic_read(&res->lr_refcount));
+ ldlm_resource_dump(res);
+ atomic_set(&res->lr_refcount, 1);
+ ldlm_resource_putref(res);
+ }
+ }
+ }
+ l_unlock(&ns->ns_lock);
- *ns_out = ns;
return ELDLM_OK;
}
-int ldlm_namespace_free(struct ldlm_namespace *ns)
+/* Cleanup, but also free, the namespace */
+int ldlm_namespace_free(struct ldlm_namespace *ns, int force)
{
- if (atomic_read(&ns->ns_refcount))
- return -EBUSY;
+ if (!ns)
+ RETURN(ELDLM_OK);
+
+ spin_lock(&ldlm_namespace_lock);
+ list_del(&ns->ns_list_chain);
+
+ spin_unlock(&ldlm_namespace_lock);
+
+ /* At shutdown time, don't call the cancellation callback */
+ ldlm_namespace_cleanup(ns, 0);
- list_del(&ns->ns_link);
- OBD_FREE(ns->ns_hash, sizeof(struct list_head) * RES_HASH_SIZE);
+#ifdef __KERNEL__
+ {
+ struct proc_dir_entry *dir;
+ dir = lprocfs_srch(ldlm_ns_proc_dir, ns->ns_name);
+ if (dir == NULL) {
+ CERROR("dlm namespace %s has no procfs dir?\n",
+ ns->ns_name);
+ } else {
+ lprocfs_remove(dir);
+ }
+ }
+#endif
+
+ POISON(ns->ns_hash, 0x5a, sizeof(*ns->ns_hash) * RES_HASH_SIZE);
+ OBD_VFREE(ns->ns_hash, sizeof(*ns->ns_hash) * RES_HASH_SIZE);
+ OBD_FREE(ns->ns_name, strlen(ns->ns_name) + 1);
OBD_FREE(ns, sizeof(*ns));
- return 0;
+ ldlm_put_ref(force);
+
+ return ELDLM_OK;
}
-static __u32 ldlm_hash_fn(struct ldlm_resource *parent, __u64 *name)
+static __u32 ldlm_hash_fn(struct ldlm_resource *parent, struct ldlm_res_id name)
{
__u32 hash = 0;
int i;
for (i = 0; i < RES_NAME_SIZE; i++)
- hash += name[i];
+ hash += name.name[i];
hash += (__u32)((unsigned long)parent >> 4);
{
struct ldlm_resource *res;
- res = kmem_cache_alloc(ldlm_resource_slab, SLAB_KERNEL);
- if (res == NULL)
+ OBD_SLAB_ALLOC(res, ldlm_resource_slab, SLAB_NOFS, sizeof *res);
+ if (res == NULL) {
LBUG();
+ return NULL;
+ }
memset(res, 0, sizeof(*res));
INIT_LIST_HEAD(&res->lr_children);
INIT_LIST_HEAD(&res->lr_converting);
INIT_LIST_HEAD(&res->lr_waiting);
- res->lr_lock = SPIN_LOCK_UNLOCKED;
-
atomic_set(&res->lr_refcount, 1);
return res;
}
-/* ldlm_lock() must be taken before calling resource_add */
-static struct ldlm_resource *ldlm_resource_add(struct ldlm_namespace *ns,
- struct ldlm_resource *parent,
- __u64 *name, __u32 type)
+/* Args: locked namespace
+ * Returns: newly-allocated, referenced, unlocked resource */
+static struct ldlm_resource *
+ldlm_resource_add(struct ldlm_namespace *ns, struct ldlm_resource *parent,
+ struct ldlm_res_id name, __u32 type)
{
struct list_head *bucket;
struct ldlm_resource *res;
+ ENTRY;
- bucket = ns->ns_hash + ldlm_hash_fn(parent, name);
+ if (type < LDLM_MIN_TYPE || type > LDLM_MAX_TYPE) {
+ LBUG();
+ RETURN(NULL);
+ }
res = ldlm_resource_new();
- if (!res)
+ if (!res) {
LBUG();
+ RETURN(NULL);
+ }
- memcpy(res->lr_name, name, sizeof(res->lr_name));
+ spin_lock(&ns->ns_counter_lock);
+ ns->ns_resources++;
+ spin_unlock(&ns->ns_counter_lock);
+
+ l_lock(&ns->ns_lock);
+ memcpy(&res->lr_name, &name, sizeof(res->lr_name));
res->lr_namespace = ns;
- if (type < 0 || type > LDLM_MAX_TYPE)
- LBUG();
+ ns->ns_refcount++;
- res->lr_type = type;
+ res->lr_type = type;
res->lr_most_restr = LCK_NL;
+
+ bucket = ns->ns_hash + ldlm_hash_fn(parent, name);
list_add(&res->lr_hash, bucket);
- atomic_inc(&ns->ns_refcount);
+
if (parent == NULL) {
- res->lr_parent = res;
- list_add(&res->lr_rootlink, &ns->ns_root_list);
+ list_add(&res->lr_childof, &ns->ns_root_list);
} else {
res->lr_parent = parent;
list_add(&res->lr_childof, &parent->lr_children);
}
+ l_unlock(&ns->ns_lock);
- return res;
+ RETURN(res);
}
-struct ldlm_resource *ldlm_resource_get(struct ldlm_namespace *ns,
- struct ldlm_resource *parent,
- __u64 *name, __u32 type, int create)
+/* Args: unlocked namespace
+ * Locks: takes and releases ns->ns_lock and res->lr_lock
+ * Returns: referenced, unlocked ldlm_resource or NULL */
+struct ldlm_resource *
+ldlm_resource_get(struct ldlm_namespace *ns, struct ldlm_resource *parent,
+ struct ldlm_res_id name, __u32 type, int create)
{
- struct list_head *bucket;
- struct list_head *tmp = bucket;
- struct ldlm_resource *res;
-
+ struct list_head *bucket, *tmp;
+ struct ldlm_resource *res = NULL;
ENTRY;
- if (ns->ns_hash == NULL)
- RETURN(NULL);
+ LASSERT(ns != NULL);
+ LASSERT(ns->ns_hash != NULL);
+ LASSERT(name.name[0] != 0);
+
+ l_lock(&ns->ns_lock);
bucket = ns->ns_hash + ldlm_hash_fn(parent, name);
- res = NULL;
list_for_each(tmp, bucket) {
- struct ldlm_resource *chk;
- chk = list_entry(tmp, struct ldlm_resource, lr_hash);
+ res = list_entry(tmp, struct ldlm_resource, lr_hash);
- if (memcmp(chk->lr_name, name, sizeof(chk->lr_name)) == 0) {
- res = chk;
- atomic_inc(&res->lr_refcount);
- break;
+ if (memcmp(&res->lr_name, &name, sizeof(res->lr_name)) == 0) {
+ ldlm_resource_getref(res);
+ l_unlock(&ns->ns_lock);
+ RETURN(res);
}
}
- if (res == NULL && create)
+ if (create)
res = ldlm_resource_add(ns, parent, name, type);
+ else
+ res = NULL;
+
+ l_unlock(&ns->ns_lock);
RETURN(res);
}
-int ldlm_resource_put(struct ldlm_resource *res)
+struct ldlm_resource *ldlm_resource_getref(struct ldlm_resource *res)
+{
+ LASSERT(res != NULL);
+ LASSERT(res != (void *)0x5a5a5a5a);
+ atomic_inc(&res->lr_refcount);
+ CDEBUG(D_INFO, "getref res: %p count: %d\n", res,
+ atomic_read(&res->lr_refcount));
+ return res;
+}
+
+/* Returns 1 if the resource was freed, 0 if it remains. */
+int ldlm_resource_putref(struct ldlm_resource *res)
{
- int rc = 0;
+ int rc = 0;
+ ENTRY;
- if (atomic_read(&res->lr_refcount) <= 0)
- LBUG();
+ CDEBUG(D_INFO, "putref res: %p count: %d\n", res,
+ atomic_read(&res->lr_refcount) - 1);
+ LASSERT(atomic_read(&res->lr_refcount) > 0);
+ LASSERT(atomic_read(&res->lr_refcount) < 0x5a5a5a5a);
if (atomic_dec_and_test(&res->lr_refcount)) {
- if (!list_empty(&res->lr_granted))
+ struct ldlm_namespace *ns = res->lr_namespace;
+ ENTRY;
+
+ l_lock(&ns->ns_lock);
+
+ if (atomic_read(&res->lr_refcount) != 0) {
+ /* We lost the race. */
+ l_unlock(&ns->ns_lock);
+ RETURN(rc);
+ }
+
+ if (!list_empty(&res->lr_granted)) {
+ ldlm_resource_dump(res);
LBUG();
+ }
- if (!list_empty(&res->lr_converting))
+ if (!list_empty(&res->lr_converting)) {
+ ldlm_resource_dump(res);
LBUG();
+ }
- if (!list_empty(&res->lr_waiting))
+ if (!list_empty(&res->lr_waiting)) {
+ ldlm_resource_dump(res);
LBUG();
+ }
- atomic_dec(&res->lr_namespace->ns_refcount);
- list_del(&res->lr_hash);
- list_del(&res->lr_rootlink);
- list_del(&res->lr_childof);
+ if (!list_empty(&res->lr_children)) {
+ ldlm_resource_dump(res);
+ LBUG();
+ }
+
+ ns->ns_refcount--;
+ list_del_init(&res->lr_hash);
+ list_del_init(&res->lr_childof);
+ l_unlock(&ns->ns_lock);
+
+ OBD_SLAB_FREE(res, ldlm_resource_slab, sizeof *res);
+
+ spin_lock(&ns->ns_counter_lock);
+ ns->ns_resources--;
+ spin_unlock(&ns->ns_counter_lock);
- kmem_cache_free(ldlm_resource_slab, res);
rc = 1;
+ EXIT;
}
- return rc;
+ RETURN(rc);
}
void ldlm_resource_add_lock(struct ldlm_resource *res, struct list_head *head,
struct ldlm_lock *lock)
{
- list_add(&lock->l_res_link, head);
- atomic_inc(&res->lr_refcount);
-}
+ l_lock(&res->lr_namespace->ns_lock);
-void ldlm_resource_del_lock(struct ldlm_lock *lock)
-{
- list_del(&lock->l_res_link);
- atomic_dec(&lock->l_resource->lr_refcount);
+ ldlm_resource_dump(res);
+ CDEBUG(D_OTHER, "About to add this lock:\n");
+ ldlm_lock_dump(D_OTHER, lock, 0);
+
+ if (lock->l_destroyed) {
+ CDEBUG(D_OTHER, "Lock destroyed, not adding to resource\n");
+ goto out;
+ }
+
+ LASSERT(list_empty(&lock->l_res_link));
+
+ list_add_tail(&lock->l_res_link, head);
+ out:
+ l_unlock(&res->lr_namespace->ns_lock);
}
-int ldlm_get_resource_handle(struct ldlm_resource *res, struct ldlm_handle *h)
+void ldlm_resource_unlink_lock(struct ldlm_lock *lock)
{
- LBUG();
- return 0;
+ l_lock(&lock->l_resource->lr_namespace->ns_lock);
+ list_del_init(&lock->l_res_link);
+ l_unlock(&lock->l_resource->lr_namespace->ns_lock);
}
void ldlm_res2desc(struct ldlm_resource *res, struct ldlm_resource_desc *desc)
{
- desc->lr_ns_id = res->lr_namespace->ns_id;
desc->lr_type = res->lr_type;
- memcpy(desc->lr_name, res->lr_name, sizeof(desc->lr_name));
+ memcpy(&desc->lr_name, &res->lr_name, sizeof(desc->lr_name));
memcpy(desc->lr_version, res->lr_version, sizeof(desc->lr_version));
}
-void ldlm_resource_dump(struct ldlm_resource *res)
+void ldlm_dump_all_namespaces(void)
{
struct list_head *tmp;
- char name[256];
- if (RES_NAME_SIZE != 3)
- LBUG();
+ spin_lock(&ldlm_namespace_lock);
- snprintf(name, sizeof(name), "%Lx %Lx %Lx",
- res->lr_name[0], res->lr_name[1], res->lr_name[2]);
+ list_for_each(tmp, &ldlm_namespace_list) {
+ struct ldlm_namespace *ns;
+ ns = list_entry(tmp, struct ldlm_namespace, ns_list_chain);
+ ldlm_namespace_dump(ns);
+ }
- CDEBUG(D_OTHER, "--- Resource: %p (%s)\n", res, name);
- CDEBUG(D_OTHER, "Namespace: %p (%u)\n", res->lr_namespace,
- res->lr_namespace->ns_id);
- CDEBUG(D_OTHER, "Parent: %p, root: %p\n", res->lr_parent, res->lr_root);
+ spin_unlock(&ldlm_namespace_lock);
+}
- CDEBUG(D_OTHER, "Granted locks:\n");
- list_for_each(tmp, &res->lr_granted) {
- struct ldlm_lock *lock;
- lock = list_entry(tmp, struct ldlm_lock, l_res_link);
- ldlm_lock_dump(lock);
- }
+void ldlm_namespace_dump(struct ldlm_namespace *ns)
+{
+ struct list_head *tmp;
- CDEBUG(D_OTHER, "Converting locks:\n");
- list_for_each(tmp, &res->lr_converting) {
- struct ldlm_lock *lock;
- lock = list_entry(tmp, struct ldlm_lock, l_res_link);
- ldlm_lock_dump(lock);
- }
+ l_lock(&ns->ns_lock);
+ CDEBUG(D_OTHER, "--- Namespace: %s (rc: %d, client: %d)\n", ns->ns_name,
+ ns->ns_refcount, ns->ns_client);
- CDEBUG(D_OTHER, "Waiting locks:\n");
- list_for_each(tmp, &res->lr_waiting) {
- struct ldlm_lock *lock;
- lock = list_entry(tmp, struct ldlm_lock, l_res_link);
- ldlm_lock_dump(lock);
+ list_for_each(tmp, &ns->ns_root_list) {
+ struct ldlm_resource *res;
+ res = list_entry(tmp, struct ldlm_resource, lr_childof);
+
+ /* Once we have resources with children, this should really dump
+ * them recursively. */
+ ldlm_resource_dump(res);
}
+ l_unlock(&ns->ns_lock);
}
+void ldlm_resource_dump(struct ldlm_resource *res)
+{
+ struct list_head *tmp;
+ int pos;
+
+ if (RES_NAME_SIZE != 4)
+ LBUG();
+
+ CDEBUG(D_OTHER, "--- Resource: %p ("LPU64"/"LPU64"/"LPU64"/"LPU64
+ ") (rc: %d)\n", res, res->lr_name.name[0], res->lr_name.name[1],
+ res->lr_name.name[2], res->lr_name.name[3],
+ atomic_read(&res->lr_refcount));
+
+ if (!list_empty(&res->lr_granted)) {
+ pos = 0;
+ CDEBUG(D_OTHER, "Granted locks:\n");
+ list_for_each(tmp, &res->lr_granted) {
+ struct ldlm_lock *lock;
+ lock = list_entry(tmp, struct ldlm_lock, l_res_link);
+ ldlm_lock_dump(D_OTHER, lock, ++pos);
+ }
+ }
+ if (!list_empty(&res->lr_converting)) {
+ pos = 0;
+ CDEBUG(D_OTHER, "Converting locks:\n");
+ list_for_each(tmp, &res->lr_converting) {
+ struct ldlm_lock *lock;
+ lock = list_entry(tmp, struct ldlm_lock, l_res_link);
+ ldlm_lock_dump(D_OTHER, lock, ++pos);
+ }
+ }
+ if (!list_empty(&res->lr_waiting)) {
+ pos = 0;
+ CDEBUG(D_OTHER, "Waiting locks:\n");
+ list_for_each(tmp, &res->lr_waiting) {
+ struct ldlm_lock *lock;
+ lock = list_entry(tmp, struct ldlm_lock, l_res_link);
+ ldlm_lock_dump(D_OTHER, lock, ++pos);
+ }
+ }
+}
git://git.whamcloud.com / fs / lustre-release.git / blobdiff