X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fmdd%2Fmdd_lock.c;h=d9921afdaf3e13cc6b0c74fdd173373a0772503e;hb=536f1a6294569f8638f372c9e17a4fb2bf829313;hp=1fdbd8b4a2b4ab8e32081b9cdef30a5bbf0f6158;hpb=e2af7fb3c91dfb13d34d8e1b2f2df8c09621f768;p=fs%2Flustre-release.git

diff --git a/lustre/mdd/mdd_lock.c b/lustre/mdd/mdd_lock.c
index 1fdbd8b..d9921af 100644
--- a/lustre/mdd/mdd_lock.c
+++ b/lustre/mdd/mdd_lock.c
@@ -26,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/
@@ -122,7 +124,7 @@ void mdd_pdo_read_unlock(const struct lu_env *env, struct mdd_object *obj,
 #else /* !MDD_DISABLE_PDO_LOCK */
 
 #ifdef CONFIG_LOCKDEP
-static cfs_lock_class_key_t mdd_pdirop_key;
+static struct lock_class_key mdd_pdirop_key;
 
 #define RETIP ((unsigned long)__builtin_return_address(0))
 
@@ -134,20 +136,12 @@ static void mdd_lockdep_init(struct mdd_object *obj)
 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 */