X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fmdd%2Fmdd_lock.c;h=7d99f7e475f7255191370fe7f97d0e0b4beea85f;hb=b0f08a4e902411a8fbdb660e5b32c5821ca7159f;hp=cf8e1277a442ee8b6099dfe46aa522fa0c85e735;hpb=0f8dca08a4f68cba82c2c822998ecc309d3b7aaf;p=fs%2Flustre-release.git diff --git a/lustre/mdd/mdd_lock.c b/lustre/mdd/mdd_lock.c index cf8e127..7d99f7e 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. @@ -28,6 +26,8 @@ /* * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved. * Use is subject to license terms. + * + * Copyright (c) 2012, Intel Corporation. */ /* * This file is part of Lustre, http://www.lustre.org/ @@ -40,49 +40,12 @@ * Author: Mike Pershin */ -#ifndef EXPORT_SYMTAB -# define EXPORT_SYMTAB -#endif #define DEBUG_SUBSYSTEM S_MDS #include #include #include "mdd_internal.h" - -#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) { @@ -120,23 +83,95 @@ int mdd_write_locked(const struct lu_env *env, struct mdd_object *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) { - dynlock_init(&obj->mod_pdlock); - mdd_lockdep_init(obj); } -unsigned long mdd_name2hash(const char *name) +void *mdd_pdo_write_lock(const struct lu_env *env, struct mdd_object *obj, + const char *name, enum mdd_object_role role) { - return full_name_hash((unsigned char*)name, strlen(name)); + 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; } -struct dynlock_handle *mdd_pdo_write_lock(const struct lu_env *env, - struct mdd_object *obj, - const char *name, - enum mdd_object_role role) +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 struct lock_class_key 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); @@ -147,10 +182,8 @@ struct dynlock_handle *mdd_pdo_write_lock(const struct lu_env *env, return handle; } -struct dynlock_handle *mdd_pdo_read_lock(const struct lu_env *env, - struct mdd_object *obj, - const char *name, - enum mdd_object_role role) +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); @@ -161,15 +194,17 @@ struct dynlock_handle *mdd_pdo_read_lock(const struct lu_env *env, } void mdd_pdo_write_unlock(const struct lu_env *env, struct mdd_object *obj, - struct dynlock_handle *dlh) + void *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) + void *dlh) { mdd_lockdep_pd_release(obj); return dynlock_unlock(&obj->mod_pdlock, dlh); } + +#endif /* MDD_DISABLE_PDO_LOCK */