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>
])
])
-# 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
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
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 */
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 */