X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fmdd%2Fmdd_lock.c;h=af762e454efacff62513a763eacfe98cf3b3e818;hb=e1df4805368b1976055031287bb5e7b9040bc6cc;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..af762e4 100644
--- a/lustre/mdd/mdd_lock.c
+++ b/lustre/mdd/mdd_lock.c
@@ -26,7 +26,7 @@
  * 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.
  */
 /*
@@ -49,40 +49,6 @@
 #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,24 +79,102 @@ void mdd_read_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);
+}
+
+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 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);
@@ -141,10 +185,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);
@@ -155,15 +197,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 */