Add Linux namespace delegation support

[mirror_zfs.git] / config / kernel-block-device-operations.m4

diff --git a/config/kernel-block-device-operations.m4 b/config/kernel-block-device-operations.m4
index c3d5eec529464f165de1ccaafa48e49fc08c0014..84e39dc8a2f63b9cf173d5951f22dea96cd648ef 100644 (file)
--- a/config/kernel-block-device-operations.m4
+++ b/config/kernel-block-device-operations.m4
@@ -6,23 +6,24 @@ AC_DEFUN([ZFS_AC_KERNEL_SRC_BLOCK_DEVICE_OPERATIONS_CHECK_EVENTS], [
                #include <linux/blkdev.h>
 
                unsigned int blk_check_events(struct gendisk *disk,
-                   unsigned int clearing) { return (0); }
+                   unsigned int clearing) {
+                       (void) disk, (void) clearing;
+                       return (0);
+               }
 
                static const struct block_device_operations
                    bops __attribute__ ((unused)) = {
                        .check_events   = blk_check_events,
                };
-       ], [], [$NO_UNUSED_BUT_SET_VARIABLE])
+       ], [], [])
 ])
 
 AC_DEFUN([ZFS_AC_KERNEL_BLOCK_DEVICE_OPERATIONS_CHECK_EVENTS], [
        AC_MSG_CHECKING([whether bops->check_events() exists])
        ZFS_LINUX_TEST_RESULT([block_device_operations_check_events], [
                AC_MSG_RESULT(yes)
-               AC_DEFINE(HAVE_BLOCK_DEVICE_OPERATIONS_CHECK_EVENTS, 1,
-                   [bops->check_events() exists])
        ],[
-               AC_MSG_RESULT(no)
+               ZFS_LINUX_TEST_ERROR([bops->check_events()])
        ])
 ])
 
@@ -33,7 +34,10 @@ AC_DEFUN([ZFS_AC_KERNEL_SRC_BLOCK_DEVICE_OPERATIONS_RELEASE_VOID], [
        ZFS_LINUX_TEST_SRC([block_device_operations_release_void], [
                #include <linux/blkdev.h>
 
-               void blk_release(struct gendisk *g, fmode_t mode) { return; }
+               void blk_release(struct gendisk *g, fmode_t mode) {
+                       (void) g, (void) mode;
+                       return;
+               }
 
                static const struct block_device_operations
                    bops __attribute__ ((unused)) = {
@@ -42,15 +46,44 @@ AC_DEFUN([ZFS_AC_KERNEL_SRC_BLOCK_DEVICE_OPERATIONS_RELEASE_VOID], [
                        .ioctl          = NULL,
                        .compat_ioctl   = NULL,
                };
-       ], [], [$NO_UNUSED_BUT_SET_VARIABLE])
+       ], [], [])
 ])
 
 AC_DEFUN([ZFS_AC_KERNEL_BLOCK_DEVICE_OPERATIONS_RELEASE_VOID], [
        AC_MSG_CHECKING([whether bops->release() is void])
        ZFS_LINUX_TEST_RESULT([block_device_operations_release_void], [
                AC_MSG_RESULT(yes)
-               AC_DEFINE(HAVE_BLOCK_DEVICE_OPERATIONS_RELEASE_VOID, 1,
-                         [bops->release() returns void])
+       ],[
+               ZFS_LINUX_TEST_ERROR([bops->release()])
+       ])
+])
+
+dnl #
+dnl # 5.13 API change
+dnl # block_device_operations->revalidate_disk() was removed
+dnl #
+AC_DEFUN([ZFS_AC_KERNEL_SRC_BLOCK_DEVICE_OPERATIONS_REVALIDATE_DISK], [
+       ZFS_LINUX_TEST_SRC([block_device_operations_revalidate_disk], [
+               #include <linux/blkdev.h>
+
+               int blk_revalidate_disk(struct gendisk *disk) {
+                       (void) disk;
+                       return(0);
+               }
+
+               static const struct block_device_operations
+                   bops __attribute__ ((unused)) = {
+                       .revalidate_disk        = blk_revalidate_disk,
+               };
+       ], [], [])
+])
+
+AC_DEFUN([ZFS_AC_KERNEL_BLOCK_DEVICE_OPERATIONS_REVALIDATE_DISK], [
+       AC_MSG_CHECKING([whether bops->revalidate_disk() exists])
+       ZFS_LINUX_TEST_RESULT([block_device_operations_revalidate_disk], [
+               AC_DEFINE([HAVE_BLOCK_DEVICE_OPERATIONS_REVALIDATE_DISK], [1],
+                       [Define if revalidate_disk() in block_device_operations])
+               AC_MSG_RESULT(yes)
        ],[
                AC_MSG_RESULT(no)
        ])
@@ -59,9 +92,11 @@ AC_DEFUN([ZFS_AC_KERNEL_BLOCK_DEVICE_OPERATIONS_RELEASE_VOID], [
 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_REVALIDATE_DISK
 ])
 
 AC_DEFUN([ZFS_AC_KERNEL_BLOCK_DEVICE_OPERATIONS], [
        ZFS_AC_KERNEL_BLOCK_DEVICE_OPERATIONS_CHECK_EVENTS
        ZFS_AC_KERNEL_BLOCK_DEVICE_OPERATIONS_RELEASE_VOID
+       ZFS_AC_KERNEL_BLOCK_DEVICE_OPERATIONS_REVALIDATE_DISK
 ])