From ab4fb9b74e9d089fc9a261c4f41e19697ad6a4ca Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Thu, 10 Dec 2020 05:22:54 +0000 Subject: [PATCH] Delete rw_semaphore.wait_lock configure check Last use of wait_lock was removed in "Linux 5.3 compat: retire rw_tryupgrade()" (e7a99dab2b065ac2f8736a65d1b226d21754d771). Fixes the issue reported in https://github.com/openzfs/zfs/issues/11097#issuecomment-714532367 Reviewed-by: Brian Behlendorf Signed-off-by: Orivej Desh Closes #11309 --- config/kernel-rwsem.m4 | 28 ---------------------------- 1 file changed, 28 deletions(-) diff --git a/config/kernel-rwsem.m4 b/config/kernel-rwsem.m4 index 824f4a3ffd..d3a64a8efa 100644 --- a/config/kernel-rwsem.m4 +++ b/config/kernel-rwsem.m4 @@ -1,29 +1,3 @@ -dnl # -dnl # 3.1 API Change -dnl # -dnl # The rw_semaphore.wait_lock member was changed from spinlock_t to -dnl # raw_spinlock_t at commit ddb6c9b58a19edcfac93ac670b066c836ff729f1. -dnl # -AC_DEFUN([ZFS_AC_KERNEL_SRC_RWSEM_SPINLOCK_IS_RAW], [ - ZFS_LINUX_TEST_SRC([rwsem_spinlock_is_raw], [ - #include - ],[ - struct rw_semaphore dummy_semaphore __attribute__ ((unused)); - raw_spinlock_t dummy_lock __attribute__ ((unused)) = - __RAW_SPIN_LOCK_INITIALIZER(dummy_lock); - dummy_semaphore.wait_lock = dummy_lock; - ]) -]) - -AC_DEFUN([ZFS_AC_KERNEL_RWSEM_SPINLOCK_IS_RAW], [ - AC_MSG_CHECKING([whether struct rw_semaphore member wait_lock is raw]) - ZFS_LINUX_TEST_RESULT([rwsem_spinlock_is_raw], [ - AC_MSG_RESULT(yes) - ],[ - ZFS_LINUX_TEST_ERROR([rwsem_spinlock_is_raw]) - ]) -]) - dnl # dnl # 3.16 API Change dnl # @@ -76,13 +50,11 @@ AC_DEFUN([ZFS_AC_KERNEL_RWSEM_ATOMIC_LONG_COUNT], [ ]) AC_DEFUN([ZFS_AC_KERNEL_SRC_RWSEM], [ - ZFS_AC_KERNEL_SRC_RWSEM_SPINLOCK_IS_RAW ZFS_AC_KERNEL_SRC_RWSEM_ACTIVITY ZFS_AC_KERNEL_SRC_RWSEM_ATOMIC_LONG_COUNT ]) AC_DEFUN([ZFS_AC_KERNEL_RWSEM], [ - ZFS_AC_KERNEL_RWSEM_SPINLOCK_IS_RAW ZFS_AC_KERNEL_RWSEM_ACTIVITY ZFS_AC_KERNEL_RWSEM_ATOMIC_LONG_COUNT ])