config: remove HAVE_KERNEL_STRSCPY

Sponsored-by: https://despairlabs.com/sponsor/
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: Tony Hutter <hutter2@llnl.gov>
Reviewed-by: Tino Reichardt <milky-zfs@mcmilk.de>
Signed-off-by: Rob Norris <robn@despairlabs.com>
Closes #16479

diff --git a/config/kernel-strlcpy.m4 b/config/kernel-strlcpy.m4
index c31cf52d78b001b868fb9a8aa97de67a894fc5ce..d50b0035e9d9913cf52c148b3f14805cdd978ca5 100644 (file)
--- a/config/kernel-strlcpy.m4
+++ b/config/kernel-strlcpy.m4
@@ -1,6 +1,5 @@
 dnl #
-dnl # 6.8.x replaced strlcpy with strscpy. Check for both so we can provide
-dnl # appropriate fallbacks.
+dnl # 6.8 removed strlcpy.
 dnl #
 AC_DEFUN([ZFS_AC_KERNEL_SRC_STRLCPY], [
        ZFS_LINUX_TEST_SRC([kernel_has_strlcpy], [
@@ -13,17 +12,6 @@ AC_DEFUN([ZFS_AC_KERNEL_SRC_STRLCPY], [
        ])
 ])
 
-AC_DEFUN([ZFS_AC_KERNEL_SRC_STRSCPY], [
-       ZFS_LINUX_TEST_SRC([kernel_has_strscpy], [
-               #include <linux/string.h>
-       ], [
-               const char *src = "goodbye";
-               char dst[32];
-               ssize_t len;
-               len = strscpy(dst, src, sizeof (dst));
-       ])
-])
-
 AC_DEFUN([ZFS_AC_KERNEL_STRLCPY], [
        AC_MSG_CHECKING([whether strlcpy() exists])
        ZFS_LINUX_TEST_RESULT([kernel_has_strlcpy], [
@@ -34,14 +22,3 @@ AC_DEFUN([ZFS_AC_KERNEL_STRLCPY], [
                AC_MSG_RESULT([no])
        ])
 ])
-
-AC_DEFUN([ZFS_AC_KERNEL_STRSCPY], [
-       AC_MSG_CHECKING([whether strscpy() exists])
-       ZFS_LINUX_TEST_RESULT([kernel_has_strscpy], [
-               AC_MSG_RESULT([yes])
-               AC_DEFINE(HAVE_KERNEL_STRSCPY, 1,
-                       [strscpy() exists])
-       ], [
-               AC_MSG_RESULT([no])
-       ])
-])

diff --git a/config/kernel.m4 b/config/kernel.m4
index c9d734bec8bf33761a59e62aa7ad592d561a9f8b..68329afedcf3d32cc4a370e47b5b1b957023f605 100644 (file)
--- a/config/kernel.m4
+++ b/config/kernel.m4
@@ -141,7 +141,6 @@ AC_DEFUN([ZFS_AC_KERNEL_TEST_SRC], [
        ZFS_AC_KERNEL_SRC_SET_SPECIAL_STATE
        ZFS_AC_KERNEL_SRC_STANDALONE_LINUX_STDARG
        ZFS_AC_KERNEL_SRC_STRLCPY
-       ZFS_AC_KERNEL_SRC_STRSCPY
        ZFS_AC_KERNEL_SRC_PAGEMAP_FOLIO_WAIT_BIT
        ZFS_AC_KERNEL_SRC_ADD_DISK
        ZFS_AC_KERNEL_SRC_KTHREAD
@@ -284,7 +283,6 @@ AC_DEFUN([ZFS_AC_KERNEL_TEST_RESULT], [
        ZFS_AC_KERNEL_SET_SPECIAL_STATE
        ZFS_AC_KERNEL_STANDALONE_LINUX_STDARG
        ZFS_AC_KERNEL_STRLCPY
-       ZFS_AC_KERNEL_STRSCPY
        ZFS_AC_KERNEL_PAGEMAP_FOLIO_WAIT_BIT
        ZFS_AC_KERNEL_ADD_DISK
        ZFS_AC_KERNEL_KTHREAD

diff --git a/include/os/linux/spl/sys/string.h b/include/os/linux/spl/sys/string.h
index f44bf23eb326cbe708578ff363df144bbc26f3d4..20bde1f0898a9f3c8a0e5c3cf453f61920993c92 100644 (file)
--- a/include/os/linux/spl/sys/string.h
+++ b/include/os/linux/spl/sys/string.h
@@ -25,10 +25,7 @@
 
 #include <linux/string.h>
 
-/* Fallbacks for kernel missing strlcpy */
 #ifndef HAVE_KERNEL_STRLCPY
-
-#if defined(HAVE_KERNEL_STRSCPY)
 /*
  * strscpy is strlcpy, but returns an error on truncation. strlcpy is defined
  * to return strlen(src), so detect error and override it.
@@ -41,10 +38,6 @@ strlcpy(char *dest, const char *src, size_t size)
                return ((size_t)ret);
        return (strlen(src));
 }
-#else
-#error "no strlcpy fallback available"
-#endif
-
 #endif /* HAVE_KERNEL_STRLCPY */
 
 #endif /* _SPL_STRING_H */