b=23289 disable pdo locks in MDD

MDT has already taken care of locks.

o=liang
i=mikhail.pershin
i=alex.zhuravlev

diff --git a/lustre/mdd/mdd_internal.h b/lustre/mdd/mdd_internal.h
index 03794a0..246951e 100644 (file)
--- a/lustre/mdd/mdd_internal.h
+++ b/lustre/mdd/mdd_internal.h
@@ -67,6 +67,10 @@ static inline void mdd_quota_wrapper(struct lu_attr *la, unsigned int *qids)
 }
 #endif
 
 }
 #endif
 

+/* PDO lock is unnecessary for current MDT stack because operations
+ * are already protected by ldlm lock */
+#define MDD_DISABLE_PDO_LOCK    1
+

 enum mdd_txn_op {
         MDD_TXN_OBJECT_DESTROY_OP = 0,
         MDD_TXN_OBJECT_CREATE_OP,
 enum mdd_txn_op {
         MDD_TXN_OBJECT_DESTROY_OP = 0,
         MDD_TXN_OBJECT_CREATE_OP,

diff --git a/lustre/mdd/mdd_lock.c b/lustre/mdd/mdd_lock.c
index cf8e127..f42594e 100644 (file)
--- a/lustre/mdd/mdd_lock.c
+++ b/lustre/mdd/mdd_lock.c
@@ -49,40 +49,6 @@
 #include <lustre_ver.h>
 #include "mdd_internal.h"
 
 #include <lustre_ver.h>
 #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)
 {
 void mdd_write_lock(const struct lu_env *env, struct mdd_object *obj,
                     enum mdd_object_role role)
 {


@@ -120,17 +86,87 @@ int mdd_write_locked(const struct lu_env *env, struct mdd_object *obj)
         return next->do_ops->do_write_locked(env, next);
 }
 
         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 */
 /* Methods for parallel directory locking */

+#if MDD_DISABLE_PDO_LOCK
+
+static struct dynlock_handle *pdo_handle = (struct dynlock_handle *)0xbabecafe;

 
 void mdd_pdlock_init(struct mdd_object *obj)
 {
 
 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,
+                                          enum mdd_object_role role)

 {
 {

-        return full_name_hash((unsigned char*)name, strlen(name));
+        return pdo_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)
+{
+        return pdo_handle;
+}
+
+void mdd_pdo_write_unlock(const struct lu_env *env, struct mdd_object *obj,
+                          struct dynlock_handle *dlh)
+{
+        LASSERT(dlh == pdo_handle);
+}
+
+void mdd_pdo_read_unlock(const struct lu_env *env, struct mdd_object *obj,
+                         struct dynlock_handle *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)
+{
+        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_pdlock_init(struct mdd_object *obj)
+{
+        dynlock_init(&obj->mod_pdlock);
+        mdd_lockdep_init(obj);

 }
 
 struct dynlock_handle *mdd_pdo_write_lock(const struct lu_env *env,
 }
 
 struct dynlock_handle *mdd_pdo_write_lock(const struct lu_env *env,


@@ -173,3 +209,5 @@ void mdd_pdo_read_unlock(const struct lu_env *env, struct mdd_object *obj,
         mdd_lockdep_pd_release(obj);
         return dynlock_unlock(&obj->mod_pdlock, dlh);
 }
         mdd_lockdep_pd_release(obj);
         return dynlock_unlock(&obj->mod_pdlock, dlh);
 }

+
+#endif /* MDD_DISABLE_PDO_LOCK */