-/* -*- MODE: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
+/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
* vim:expandtab:shiftwidth=8:tabstop=8:
*
- * mdd/mdd_handler.c
- * Lustre Metadata Server (mdd) routines
+ * GPL HEADER START
*
- * Copyright (C) 2006 Cluster File Systems, Inc.
- * Author: Mike Pershin <tappro@clusterfs.com>
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * This file is part of the Lustre file system, http://www.lustre.org
- * Lustre is a trademark of Cluster File Systems, Inc.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 only,
+ * as published by the Free Software Foundation.
*
- * You may have signed or agreed to another license before downloading
- * this software. If so, you are bound by the terms and conditions
- * of that agreement, and the following does not apply to you. See the
- * LICENSE file included with this distribution for more information.
+ * This program 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 version 2 for more details (a copy is included
+ * in the LICENSE file that accompanied this code).
*
- * If you did not agree to a different license, then this copy of Lustre
- * is open source 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.
+ * You should have received a copy of the GNU General Public License
+ * version 2 along with this program; If not, see
+ * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf
*
- * In either case, 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
- * license text for more details.
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ *
+ * GPL HEADER END
+ */
+/*
+ * Copyright 2008 Sun Microsystems, Inc. All rights reserved
+ * Use is subject to license terms.
+ */
+/*
+ * This file is part of Lustre, http://www.lustre.org/
+ * Lustre is a trademark of Sun Microsystems, Inc.
+ *
+ * lustre/mdd/mdd_lock.c
+ *
+ * Lustre Metadata Server (mdd) routines
+ *
+ * Author: Mike Pershin <tappro@clusterfs.com>
*/
+
#ifndef EXPORT_SYMTAB
# define EXPORT_SYMTAB
#endif
#include <lustre_ver.h>
#include "mdd_internal.h"
-void mdd_write_lock(const struct lu_env *env, struct mdd_object *obj)
+
+#ifdef CONFIG_LOCKDEP
+static cfs_lock_class_key_t mdd_pdirop_key;
+
+#define RETIP ((unsigned long)__builtin_return_address(0))
+
+static void mdd_lockdep_init(struct mdd_object *obj)
+{
+ lockdep_set_class_and_name(obj, &mdd_pdirop_key, "pdir");
+}
+
+static void mdd_lockdep_pd_acquire(struct mdd_object *obj,
+ enum mdd_object_role role)
+{
+ lock_acquire(&obj->dep_map, role, 0, 1, 2, RETIP);
+}
+
+static void mdd_lockdep_pd_release(struct mdd_object *obj)
+{
+ lock_release(&obj->dep_map, 0, RETIP);
+}
+
+#else /* !CONFIG_LOCKDEP */
+
+static void mdd_lockdep_init(struct mdd_object *obj)
+{}
+static void mdd_lockdep_pd_acquire(struct mdd_object *obj,
+ enum mdd_object_role role)
+{}
+static void mdd_lockdep_pd_release(struct mdd_object *obj)
+{}
+
+#endif /* !CONFIG_LOCKDEP */
+
+void mdd_write_lock(const struct lu_env *env, struct mdd_object *obj,
+ enum mdd_object_role role)
{
struct dt_object *next = mdd_object_child(obj);
- next->do_ops->do_write_lock(env, next);
+ next->do_ops->do_write_lock(env, next, role);
}
-void mdd_read_lock(const struct lu_env *env, struct mdd_object *obj)
+void mdd_read_lock(const struct lu_env *env, struct mdd_object *obj,
+ enum mdd_object_role role)
{
struct dt_object *next = mdd_object_child(obj);
- next->do_ops->do_read_lock(env, next);
+
+ next->do_ops->do_read_lock(env, next, role);
}
void mdd_write_unlock(const struct lu_env *env, struct mdd_object *obj)
next->do_ops->do_read_unlock(env, next);
}
+int mdd_write_locked(const struct lu_env *env, struct mdd_object *obj)
+{
+ struct dt_object *next = mdd_object_child(obj);
+
+ return next->do_ops->do_write_locked(env, next);
+}
/* Methods for parallel directory locking */
void mdd_pdlock_init(struct mdd_object *obj)
{
dynlock_init(&obj->mod_pdlock);
-
+ mdd_lockdep_init(obj);
}
unsigned long mdd_name2hash(const char *name)
struct dynlock_handle *mdd_pdo_write_lock(const struct lu_env *env,
struct mdd_object *obj,
- const char *name)
+ const char *name,
+ enum mdd_object_role role)
{
+ struct dynlock_handle *handle;
unsigned long value = mdd_name2hash(name);
- return dynlock_lock(&obj->mod_pdlock, value, DLT_WRITE, GFP_NOFS);
+
+ handle = dynlock_lock(&obj->mod_pdlock, value, DLT_WRITE, GFP_NOFS);
+ if (handle != NULL)
+ mdd_lockdep_pd_acquire(obj, role);
+ return handle;
}
struct dynlock_handle *mdd_pdo_read_lock(const struct lu_env *env,
struct mdd_object *obj,
- const char *name)
+ const char *name,
+ enum mdd_object_role role)
{
+ struct dynlock_handle *handle;
unsigned long value = mdd_name2hash(name);
- return dynlock_lock(&obj->mod_pdlock, value, DLT_READ, GFP_NOFS);
+ handle = dynlock_lock(&obj->mod_pdlock, value, DLT_READ, GFP_NOFS);
+ if (handle != NULL)
+ mdd_lockdep_pd_acquire(obj, role);
+ return handle;
}
void mdd_pdo_write_unlock(const struct lu_env *env, struct mdd_object *obj,
struct dynlock_handle *dlh)
{
+ mdd_lockdep_pd_release(obj);
return dynlock_unlock(&obj->mod_pdlock, dlh);
}
void mdd_pdo_read_unlock(const struct lu_env *env, struct mdd_object *obj,
struct dynlock_handle *dlh)
{
+ mdd_lockdep_pd_release(obj);
return dynlock_unlock(&obj->mod_pdlock, dlh);
}
-
git://git.whamcloud.com / fs / lustre-release.git / blobdiff