X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fmdd%2Fmdd_lock.c;h=193de6e1efdad140d6fea44d0dc459483b556cdc;hb=1db90b29ad676c2cf1888ef5a7c623161ff23bf9;hp=af762e454efacff62513a763eacfe98cf3b3e818;hpb=69efa174743f5ad2425c0ccd951961ae356fed0d;p=fs%2Flustre-release.git diff --git a/lustre/mdd/mdd_lock.c b/lustre/mdd/mdd_lock.c index af762e4..193de6e 100644 --- a/lustre/mdd/mdd_lock.c +++ b/lustre/mdd/mdd_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. @@ -17,17 +15,15 @@ * * 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 - * - * 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. + * http://www.gnu.org/licenses/gpl-2.0.html * * GPL HEADER END */ /* * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved. * Use is subject to license terms. + * + * Copyright (c) 2012, 2014, Intel Corporation. */ /* * This file is part of Lustre, http://www.lustre.org/ @@ -40,174 +36,44 @@ * Author: Mike Pershin */ -#ifndef EXPORT_SYMTAB -# define EXPORT_SYMTAB -#endif #define DEBUG_SUBSYSTEM S_MDS #include -#include #include "mdd_internal.h" void mdd_write_lock(const struct lu_env *env, struct mdd_object *obj, - enum mdd_object_role role) + enum mdd_object_role role) { - struct dt_object *next = mdd_object_child(obj); + struct dt_object *next = mdd_object_child(obj); - next->do_ops->do_write_lock(env, next, role); + dt_write_lock(env, next, role); } void mdd_read_lock(const struct lu_env *env, struct mdd_object *obj, - enum mdd_object_role role) + enum mdd_object_role role) { - struct dt_object *next = mdd_object_child(obj); + struct dt_object *next = mdd_object_child(obj); - next->do_ops->do_read_lock(env, next, role); + dt_read_lock(env, next, role); } void mdd_write_unlock(const struct lu_env *env, struct mdd_object *obj) { - struct dt_object *next = mdd_object_child(obj); + struct dt_object *next = mdd_object_child(obj); - next->do_ops->do_write_unlock(env, next); + dt_write_unlock(env, next); } void mdd_read_unlock(const struct lu_env *env, struct mdd_object *obj) { - struct dt_object *next = mdd_object_child(obj); + struct dt_object *next = mdd_object_child(obj); - next->do_ops->do_read_unlock(env, next); + dt_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); -} - -unsigned long mdd_name2hash(const char *name) -{ - return full_name_hash((unsigned char*)name, strlen(name)); -} - -/* Methods for parallel directory locking */ -#if MDD_DISABLE_PDO_LOCK - -static void *pdo_handle = (void *)0xbabecafe; - -void mdd_pdlock_init(struct mdd_object *obj) -{ -} - -void *mdd_pdo_write_lock(const struct lu_env *env, struct mdd_object *obj, - const char *name, enum mdd_object_role role) -{ - return pdo_handle; -} - -void *mdd_pdo_read_lock(const struct lu_env *env, struct mdd_object *obj, - const char *name, enum mdd_object_role role) -{ - return pdo_handle; -} - -void mdd_pdo_write_unlock(const struct lu_env *env, struct mdd_object *obj, - void *dlh) -{ - LASSERT(dlh == pdo_handle); -} - -void mdd_pdo_read_unlock(const struct lu_env *env, struct mdd_object *obj, - void *dlh) -{ - LASSERT(dlh == pdo_handle); -} - -#else /* !MDD_DISABLE_PDO_LOCK */ - -#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) -{ -#ifdef HAVE_LOCK_MAP_ACQUIRE - lock_map_acquire(&obj->dep_map); -#else - lock_acquire(&obj->dep_map, role, 0, 1, 2, RETIP); -#endif -} - -static void mdd_lockdep_pd_release(struct mdd_object *obj) -{ -#ifdef HAVE_LOCK_MAP_ACQUIRE - lock_map_release(&obj->dep_map); -#else - lock_release(&obj->dep_map, 0, RETIP); -#endif -} - -#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_pdlock_init(struct mdd_object *obj) -{ - dynlock_init(&obj->mod_pdlock); - mdd_lockdep_init(obj); -} - -void *mdd_pdo_write_lock(const struct lu_env *env, struct mdd_object *obj, - const char *name, enum mdd_object_role role) -{ - struct dynlock_handle *handle; - unsigned long value = mdd_name2hash(name); - - handle = dynlock_lock(&obj->mod_pdlock, value, DLT_WRITE, GFP_NOFS); - if (handle != NULL) - mdd_lockdep_pd_acquire(obj, role); - return handle; -} - -void *mdd_pdo_read_lock(const struct lu_env *env, struct mdd_object *obj, - const char *name, enum mdd_object_role role) -{ - struct dynlock_handle *handle; - unsigned long value = mdd_name2hash(name); - handle = dynlock_lock(&obj->mod_pdlock, value, DLT_READ, GFP_NOFS); - if (handle != NULL) - mdd_lockdep_pd_acquire(obj, role); - return handle; -} + struct dt_object *next = mdd_object_child(obj); -void mdd_pdo_write_unlock(const struct lu_env *env, struct mdd_object *obj, - void *dlh) -{ - mdd_lockdep_pd_release(obj); - return dynlock_unlock(&obj->mod_pdlock, dlh); + return dt_write_locked(env, next); } - -void mdd_pdo_read_unlock(const struct lu_env *env, struct mdd_object *obj, - void *dlh) -{ - mdd_lockdep_pd_release(obj); - return dynlock_unlock(&obj->mod_pdlock, dlh); -} - -#endif /* MDD_DISABLE_PDO_LOCK */