From: James Simmons <uja.ornl@gmail.com>
Date: Fri, 2 Aug 2013 11:47:47 +0000 (-0400)
Subject: LU-2800 autoconf: remove LC_LOCK_MAP_ACQUIRE test
X-Git-Tag: 2.4.91~10
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=refs%2Fchanges%2F69%2F5369%2F9;p=fs%2Flustre-release.git

LU-2800 autoconf: remove LC_LOCK_MAP_ACQUIRE test

lock_map_acquire has been in the upstream kernel since v2.6.27.
We can remove the test and dead code.

Signed-off-by: Jeff Mahoney <jeffm@suse.com>
Signed-off-by: James Simmons <uja.ornl@gmail.com>
Change-Id: I4ac4cb6c92f79408712b210eec11a9e350e6ccde
Reviewed-on: http://review.whamcloud.com/5369
Tested-by: Hudson
Tested-by: Maloo <whamcloud.maloo@gmail.com>
Reviewed-by: Bob Glossman <bob.glossman@intel.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
---

diff --git a/lustre/autoconf/lustre-core.m4 b/lustre/autoconf/lustre-core.m4
index 55d9e0e..9544315 100644
--- a/lustre/autoconf/lustre-core.m4
+++ b/lustre/autoconf/lustre-core.m4
@@ -631,23 +631,6 @@ LB_LINUX_TRY_COMPILE([
 ])
 ])
 
-# LC_LOCK_MAP_ACQUIRE
-# after 2.6.27 lock_map_acquire replaces lock_acquire
-AC_DEFUN([LC_LOCK_MAP_ACQUIRE],
-[AC_MSG_CHECKING([if lock_map_acquire is defined])
-LB_LINUX_TRY_COMPILE([
-        #include <linux/lockdep.h>
-],[
-        lock_map_acquire(NULL);
-],[
-        AC_MSG_RESULT(yes)
-        AC_DEFINE(HAVE_LOCK_MAP_ACQUIRE, 1,
-                [lock_map_acquire is defined])
-],[
-        AC_MSG_RESULT(no)
-])
-])
-
 # 2.6.27.15-2 sles11
 
 # 2.6.27 sles11 remove the bi_hw_segments
@@ -1569,7 +1552,6 @@ AC_DEFUN([LC_PROG_LINUX],
          LC_INODE_PERMISION_2ARGS
          LC_QUOTA_ON_5ARGS
          LC_QUOTA_OFF_3ARGS
-         LC_LOCK_MAP_ACQUIRE
 
          # 2.6.27.15-2 sles11
          LC_BI_HW_SEGMENTS
diff --git a/lustre/mdd/mdd_lock.c b/lustre/mdd/mdd_lock.c
index 7d99f7e..d9921af 100644
--- a/lustre/mdd/mdd_lock.c
+++ b/lustre/mdd/mdd_lock.c
@@ -136,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 */
diff --git a/lustre/obdclass/cl_lock.c b/lustre/obdclass/cl_lock.c
index b6e8ff5..c6a36fe 100644
--- a/lustre/obdclass/cl_lock.c
+++ b/lustre/obdclass/cl_lock.c
@@ -166,20 +166,14 @@ static void cl_lock_lockdep_acquire(const struct lu_env *env,
                                     struct cl_lock *lock, __u32 enqflags)
 {
         cl_lock_counters(env, lock)->ctc_nr_locks_acquired++;
-#ifdef HAVE_LOCK_MAP_ACQUIRE
         lock_map_acquire(&lock->dep_map);
-#else  /* HAVE_LOCK_MAP_ACQUIRE */
-        lock_acquire(&lock->dep_map, !!(enqflags & CEF_ASYNC),
-                     /* try: */ 0, lock->cll_descr.cld_mode <= CLM_READ,
-                     /* check: */ 2, RETIP);
-#endif /* HAVE_LOCK_MAP_ACQUIRE */
 }
 
 static void cl_lock_lockdep_release(const struct lu_env *env,
                                     struct cl_lock *lock)
 {
         cl_lock_counters(env, lock)->ctc_nr_locks_acquired--;
-        lock_release(&lock->dep_map, 0, RETIP);
+	lock_map_release(&lock->dep_map);
 }
 
 #else /* !CONFIG_LOCKDEP */