838a249012
Kernel commit 2b0d3d3e4fcfb brought in some changes to the struct percpu_ref structure that moves most of its fields into a member struct named "data" of type struct percpu_ref_data. This includes the "count" member which is updated by vdev_blkg_tryget(), so update this function to chase the API change, and detect it via configure. Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov> Signed-off-by: Coleman Kane <ckane@colemankane.org> Closes #11085
61 lines
1.5 KiB
Plaintext
61 lines
1.5 KiB
Plaintext
dnl #
|
|
dnl # 3.18 API change,
|
|
dnl # The function percpu_counter_init now must be passed a GFP mask.
|
|
dnl #
|
|
AC_DEFUN([ZFS_AC_KERNEL_SRC_PERCPU_COUNTER_INIT], [
|
|
ZFS_LINUX_TEST_SRC([percpu_counter_init_with_gfp], [
|
|
#include <linux/gfp.h>
|
|
#include <linux/percpu_counter.h>
|
|
],[
|
|
struct percpu_counter counter;
|
|
int error;
|
|
|
|
error = percpu_counter_init(&counter, 0, GFP_KERNEL);
|
|
])
|
|
])
|
|
|
|
AC_DEFUN([ZFS_AC_KERNEL_PERCPU_COUNTER_INIT], [
|
|
AC_MSG_CHECKING([whether percpu_counter_init() wants gfp_t])
|
|
ZFS_LINUX_TEST_RESULT([percpu_counter_init_with_gfp], [
|
|
AC_MSG_RESULT(yes)
|
|
AC_DEFINE(HAVE_PERCPU_COUNTER_INIT_WITH_GFP, 1,
|
|
[percpu_counter_init() wants gfp_t])
|
|
],[
|
|
AC_MSG_RESULT(no)
|
|
])
|
|
])
|
|
|
|
dnl #
|
|
dnl # 5.10 API change,
|
|
dnl # The "count" was moved into ref->data, from ref
|
|
dnl #
|
|
AC_DEFUN([ZFS_AC_KERNEL_SRC_PERCPU_REF_COUNT_IN_DATA], [
|
|
ZFS_LINUX_TEST_SRC([percpu_ref_count_in_data], [
|
|
#include <linux/percpu-refcount.h>
|
|
],[
|
|
struct percpu_ref_data d;
|
|
|
|
atomic_long_set(&d.count, 1L);
|
|
])
|
|
])
|
|
|
|
AC_DEFUN([ZFS_AC_KERNEL_PERCPU_REF_COUNT_IN_DATA], [
|
|
AC_MSG_CHECKING([whether is inside percpu_ref.data])
|
|
ZFS_LINUX_TEST_RESULT([percpu_ref_count_in_data], [
|
|
AC_MSG_RESULT(yes)
|
|
AC_DEFINE(ZFS_PERCPU_REF_COUNT_IN_DATA, 1,
|
|
[count is located in percpu_ref.data])
|
|
],[
|
|
AC_MSG_RESULT(no)
|
|
])
|
|
])
|
|
AC_DEFUN([ZFS_AC_KERNEL_SRC_PERCPU], [
|
|
ZFS_AC_KERNEL_SRC_PERCPU_COUNTER_INIT
|
|
ZFS_AC_KERNEL_SRC_PERCPU_REF_COUNT_IN_DATA
|
|
])
|
|
|
|
AC_DEFUN([ZFS_AC_KERNEL_PERCPU], [
|
|
ZFS_AC_KERNEL_PERCPU_COUNTER_INIT
|
|
ZFS_AC_KERNEL_PERCPU_REF_COUNT_IN_DATA
|
|
])
|