Remove mutex_lock_nested() wrapper

The mutex_lock_nested() function has been available since Linux 2.6.18. There is no longer a need to maintain this compatibility code. Signed-off-by: Brian Behlendorf <[email protected]>
rtvd · Oct 17, 2014 · b652d16 · b652d16
1 parent 2bc5666
commit b652d16
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 62 deletions.
diff --git a/config/spl-build.m4 b/config/spl-build.m4
@@ -29,7 +29,6 @@ AC_DEFUN([SPL_AC_CONFIG_KERNEL], [
  SPL_AC_PDE_DATA
  SPL_AC_MUTEX_OWNER
  SPL_AC_MUTEX_OWNER_TASK_STRUCT
- SPL_AC_MUTEX_LOCK_NESTED
  SPL_AC_3ARGS_ON_EACH_CPU
  SPL_AC_KALLSYMS_LOOKUP_NAME
  SPL_AC_GET_VMALLOC_INFO
@@ -973,29 +972,6 @@ AC_DEFUN([SPL_AC_MUTEX_OWNER_TASK_STRUCT], [
  EXTRA_KCFLAGS="$tmp_flags"
 ])
 
-dnl #
-dnl # 2.6.18 API change,
-dnl # First introduced 'mutex_lock_nested()' in include/linux/mutex.h,
-dnl # as part of the mutex validator. Fallback to using 'mutex_lock()' 
-dnl # if the mutex validator is disabled or otherwise unavailable.
-dnl #
-AC_DEFUN([SPL_AC_MUTEX_LOCK_NESTED], [
- AC_MSG_CHECKING([whether mutex_lock_nested() is available])
- SPL_LINUX_TRY_COMPILE([
- #include <linux/mutex.h>
- ],[
- struct mutex mutex;
- mutex_init(&mutex);
- mutex_lock_nested(&mutex, 0);
- ],[
- AC_MSG_RESULT(yes)
- AC_DEFINE(HAVE_MUTEX_LOCK_NESTED, 1,
- [mutex_lock_nested() is available])
- ],[
- AC_MSG_RESULT(no)
- ])
-])
-
 dnl #
 dnl # 2.6.27 API change,
 dnl # on_each_cpu() uses 3 args, no 'retry' argument

diff --git a/include/linux/Makefile.am b/include/linux/Makefile.am
@@ -10,7 +10,6 @@ KERNEL_H = \
  $(top_srcdir)/include/linux/math64_compat.h \
  $(top_srcdir)/include/linux/mm_compat.h \
  $(top_srcdir)/include/linux/module_compat.h \
- $(top_srcdir)/include/linux/mutex_compat.h \
  $(top_srcdir)/include/linux/proc_compat.h \
  $(top_srcdir)/include/linux/rwsem_compat.h \
  $(top_srcdir)/include/linux/smp_compat.h \

diff --git a/include/linux/mutex_compat.h b/include/linux/mutex_compat.h
diff --git a/include/sys/types.h b/include/sys/types.h
@@ -33,7 +33,6 @@
 #include <linux/bitops_compat.h>
 #include <linux/smp_compat.h>
 #include <linux/kallsyms_compat.h>
-#include <linux/mutex_compat.h>
 #include <linux/module_compat.h>
 #include <linux/sysctl_compat.h>
 #include <linux/proc_compat.h>