From 8a7387af46ac7a8ac2a9da6a11fd83520a7fb75a Mon Sep 17 00:00:00 2001
From: Rob Norris <robn@despairlabs.com>
Date: Sat, 24 Aug 2024 20:57:43 +1000
Subject: [PATCH] config: remove HAVE_PERCPU_COUNTER_ADD_BATCH

Sponsored-by: https://despairlabs.com/sponsor/
Signed-off-by: Rob Norris <robn@despairlabs.com>
---
 config/kernel-percpu.m4          | 27 ---------------------------
 include/os/linux/spl/sys/wmsum.h |  4 ----
 2 files changed, 31 deletions(-)

diff --git a/config/kernel-percpu.m4 b/config/kernel-percpu.m4
index f42b27bd52..12e81892cb 100644
--- a/config/kernel-percpu.m4
+++ b/config/kernel-percpu.m4
@@ -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 # 5.10 API change,
 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], [
-	ZFS_AC_KERNEL_SRC_PERCPU_COUNTER_ADD_BATCH
 	ZFS_AC_KERNEL_SRC_PERCPU_REF_COUNT_IN_DATA
 ])
 
 AC_DEFUN([ZFS_AC_KERNEL_PERCPU], [
-	ZFS_AC_KERNEL_PERCPU_COUNTER_ADD_BATCH
 	ZFS_AC_KERNEL_PERCPU_REF_COUNT_IN_DATA
 ])
diff --git a/include/os/linux/spl/sys/wmsum.h b/include/os/linux/spl/sys/wmsum.h
index 8fdc3f4b16..1c87f56e13 100644
--- a/include/os/linux/spl/sys/wmsum.h
+++ b/include/os/linux/spl/sys/wmsum.h
@@ -57,11 +57,7 @@ static inline void
 wmsum_add(wmsum_t *ws, int64_t delta)
 {
 
-#ifdef HAVE_PERCPU_COUNTER_ADD_BATCH
 	percpu_counter_add_batch(ws, delta, INT_MAX / 2);
-#else
-	__percpu_counter_add(ws, delta, INT_MAX / 2);
-#endif
 }
 
 #ifdef	__cplusplus