]> git.proxmox.com Git - mirror_zfs.git/commitdiff
Linux 6.8 compat: fix inode permission tests
authorRob Norris <robn@despairlabs.com>
Tue, 23 Jan 2024 06:43:20 +0000 (17:43 +1100)
committerBrian Behlendorf <behlendorf1@llnl.gov>
Mon, 29 Jan 2024 19:36:07 +0000 (11:36 -0800)
The name inode_permission is now defined in the kernel. Rename ours to
test_permission, in line with most of our other tests.

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Rob Norris <robn@despairlabs.com>
Sponsored-by: https://despairlabs.com/sponsor/
Closes #15805

config/kernel-inode-permission.m4

index aef4005c406bb37aa2eda5568a0f30c7d0cb3f81..f7fc16439093fac9d48f3c84625717cd8603b5af 100644 (file)
@@ -8,12 +8,12 @@ AC_DEFUN([ZFS_AC_KERNEL_SRC_PERMISSION], [
                #include <linux/fs.h>
                #include <linux/sched.h>
 
-               static int inode_permission(struct mnt_idmap *idmap,
+               static int test_permission(struct mnt_idmap *idmap,
                    struct inode *inode, int mask) { return 0; }
 
                static const struct inode_operations
                        iops __attribute__ ((unused)) = {
-                       .permission             = inode_permission,
+                       .permission             = test_permission,
                };
        ],[])
 
@@ -25,12 +25,12 @@ AC_DEFUN([ZFS_AC_KERNEL_SRC_PERMISSION], [
                #include <linux/fs.h>
                #include <linux/sched.h>
 
-               static int inode_permission(struct user_namespace *userns,
+               static int test_permission(struct user_namespace *userns,
                    struct inode *inode, int mask) { return 0; }
 
                static const struct inode_operations
                        iops __attribute__ ((unused)) = {
-                       .permission             = inode_permission,
+                       .permission             = test_permission,
                };
        ],[])
 ])