LU-3500 mdt: use __u64 for sp_cr_flags

[fs/lustre-release.git] / lustre / mdd / mdd_lock.c

diff --git a/lustre/mdd/mdd_lock.c b/lustre/mdd/mdd_lock.c
index c275eb0..d9921af 100644 (file)
--- 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/
@@ -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 */