X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fmdd%2Fmdd_lock.c;h=60bf87dcf371b32ed614f116c3471c14b4b448e8;hb=1ebc8dc473dd9f948837b9d5b258194637d46525;hp=e90ae04d60650269e03457d42b146724c60d1e0e;hpb=6c8ed1d8edb0f6fe1d79172f7fa4a0fcf5053dfe;p=fs%2Flustre-release.git

diff --git a/lustre/mdd/mdd_lock.c b/lustre/mdd/mdd_lock.c
index e90ae04..60bf87d 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.
@@ -26,8 +24,10 @@
  * GPL HEADER END
  */
 /*
- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * 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 <tappro@clusterfs.com>
  */
 
-#ifndef EXPORT_SYMTAB
-# define EXPORT_SYMTAB
-#endif
 #define DEBUG_SUBSYSTEM S_MDS
 
 #include <linux/module.h>
 #include <lustre_ver.h>
 #include "mdd_internal.h"
 
-
-#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_init_map(&obj->mod_dep_map_pdlock, "pdir", &mdd_pdirop_key);
-}
-
-static void mdd_lockdep_pd_acquire(struct mdd_object *obj,
-                                   enum mdd_object_role role)
-{
-        lock_acquire(&obj->mod_dep_map_pdlock, role, 0, 1, 2, RETIP);
-}
-
-static void mdd_lockdep_pd_release(struct mdd_object *obj)
-{
-        lock_release(&obj->mod_dep_map_pdlock, 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)
 {
@@ -113,57 +76,9 @@ void mdd_read_unlock(const struct lu_env *env, struct mdd_object *obj)
         next->do_ops->do_read_unlock(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)
-{
-        return full_name_hash((unsigned char*)name, strlen(name));
-}
-
-struct dynlock_handle *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;
-}
-
-struct dynlock_handle *mdd_pdo_read_lock(const struct lu_env *env,
-                                         struct mdd_object *obj,
-                                         const char *name,
-                                         enum mdd_object_role role)
+int mdd_write_locked(const struct lu_env *env, struct mdd_object *obj)
 {
-        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;
-}
-
-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);
-}
+        struct dt_object  *next = mdd_object_child(obj);
 
-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);
+        return next->do_ops->do_write_locked(env, next);
 }