Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

config: remove HAVE_PERCPU_COUNTER_ADD_BATCH 

Sponsored-by: https://despairlabs.com/sponsor/
Signed-off-by: Rob Norris <robn@despairlabs.com>
This commit is contained in:
Rob Norris 2024-08-24 20:57:43 +10:00
parent 6612451009
commit 8a7387af46
2 changed files with 0 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
config/kernel-percpu.m4
View File

@ -1,28 +1,3 @@
dnl #
dnl # 4.13 API change,
dnl # __percpu_counter_add() was renamed to percpu_counter_add_batch().
dnl #
AC_DEFUN([ZFS_AC_KERNEL_SRC_PERCPU_COUNTER_ADD_BATCH], [
ZFS_LINUX_TEST_SRC([percpu_counter_add_batch], [
#include <linux/percpu_counter.h>
],[
struct percpu_counter counter;
percpu_counter_add_batch(&counter, 1, 1);
])
])
AC_DEFUN([ZFS_AC_KERNEL_PERCPU_COUNTER_ADD_BATCH], [
AC_MSG_CHECKING([whether percpu_counter_add_batch() is defined])
ZFS_LINUX_TEST_RESULT([percpu_counter_add_batch], [
AC_MSG_RESULT(yes)
AC_DEFINE(HAVE_PERCPU_COUNTER_ADD_BATCH, 1,
[percpu_counter_add_batch() is defined])
],[
AC_MSG_RESULT(no)
])
])
dnl # dnl #
dnl # 5.10 API change, dnl # 5.10 API change,
dnl # The "count" was moved into ref->data, from ref dnl # The "count" was moved into ref->data, from ref
@ -48,11 +23,9 @@ AC_DEFUN([ZFS_AC_KERNEL_PERCPU_REF_COUNT_IN_DATA], [
]) ])
]) ])
AC_DEFUN([ZFS_AC_KERNEL_SRC_PERCPU], [ AC_DEFUN([ZFS_AC_KERNEL_SRC_PERCPU], [
ZFS_AC_KERNEL_SRC_PERCPU_COUNTER_ADD_BATCH
ZFS_AC_KERNEL_SRC_PERCPU_REF_COUNT_IN_DATA ZFS_AC_KERNEL_SRC_PERCPU_REF_COUNT_IN_DATA
]) ])
AC_DEFUN([ZFS_AC_KERNEL_PERCPU], [ AC_DEFUN([ZFS_AC_KERNEL_PERCPU], [
ZFS_AC_KERNEL_PERCPU_COUNTER_ADD_BATCH
ZFS_AC_KERNEL_PERCPU_REF_COUNT_IN_DATA ZFS_AC_KERNEL_PERCPU_REF_COUNT_IN_DATA
]) ])

4
include/os/linux/spl/sys/wmsum.h
View File

@ -57,11 +57,7 @@ static inline void
wmsum_add(wmsum_t *ws, int64_t delta) wmsum_add(wmsum_t *ws, int64_t delta)
{ {
#ifdef HAVE_PERCPU_COUNTER_ADD_BATCH
percpu_counter_add_batch(ws, delta, INT_MAX / 2); percpu_counter_add_batch(ws, delta, INT_MAX / 2);
#else
__percpu_counter_add(ws, delta, INT_MAX / 2);
#endif
} }
#ifdef __cplusplus #ifdef __cplusplus