Shorten macro & configure test names for 1-arg release handler test

Signed-off-by: Coleman Kane <[email protected]>
openzfs · Jul 30, 2023 · 40e11da · 40e11da
1 parent 9e920ec
commit 40e11da
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/config/kernel-block-device-operations.m4 b/config/kernel-block-device-operations.m4
@@ -52,7 +52,7 @@ AC_DEFUN([ZFS_AC_KERNEL_SRC_BLOCK_DEVICE_OPERATIONS_RELEASE_VOID], [
 dnl #
 dnl # 5.9.x API change
 dnl #
-AC_DEFUN([ZFS_AC_KERNEL_SRC_BLOCK_DEVICE_OPERATIONS_RELEASE_VOID_1ARG], [
+AC_DEFUN([ZFS_AC_KERNEL_SRC_BLOCK_DEVICE_OPERATIONS_RELEASE_1ARG], [
 	ZFS_LINUX_TEST_SRC([block_device_operations_release_void_1arg], [
 		#include <linux/blkdev.h>
 
@@ -80,7 +80,7 @@ AC_DEFUN([ZFS_AC_KERNEL_BLOCK_DEVICE_OPERATIONS_RELEASE_VOID], [
 		AC_MSG_CHECKING([whether bops->release() is void and takes 1 arg])
 		ZFS_LINUX_TEST_RESULT([block_device_operations_release_void_1arg], [
 			AC_MSG_RESULT(yes)
-			AC_DEFINE([HAVE_BLOCK_DEVICE_OPERATIONS_RELEASE_VOID_1ARG], [1],
+			AC_DEFINE([HAVE_BLOCK_DEVICE_OPERATIONS_RELEASE_1ARG], [1],
 				[Define if release() in block_device_operations takes 1 arg])
 		],[
 			ZFS_LINUX_TEST_ERROR([bops->release()])
@@ -122,7 +122,7 @@ AC_DEFUN([ZFS_AC_KERNEL_BLOCK_DEVICE_OPERATIONS_REVALIDATE_DISK], [
 AC_DEFUN([ZFS_AC_KERNEL_SRC_BLOCK_DEVICE_OPERATIONS], [
 	ZFS_AC_KERNEL_SRC_BLOCK_DEVICE_OPERATIONS_CHECK_EVENTS
 	ZFS_AC_KERNEL_SRC_BLOCK_DEVICE_OPERATIONS_RELEASE_VOID
-	ZFS_AC_KERNEL_SRC_BLOCK_DEVICE_OPERATIONS_RELEASE_VOID_1ARG
+	ZFS_AC_KERNEL_SRC_BLOCK_DEVICE_OPERATIONS_RELEASE_1ARG
 	ZFS_AC_KERNEL_SRC_BLOCK_DEVICE_OPERATIONS_REVALIDATE_DISK
 ])
 

diff --git a/module/os/linux/zfs/zvol_os.c b/module/os/linux/zfs/zvol_os.c
@@ -817,7 +817,7 @@ zvol_open(struct block_device *bdev, fmode_t flag)
 }
 
 static void
-#ifdef HAVE_BLOCK_DEVICE_OPERATIONS_RELEASE_VOID_1ARG
+#ifdef HAVE_BLOCK_DEVICE_OPERATIONS_RELEASE_1ARG
 zvol_release(struct gendisk *disk)
 {
 #else