diff --git a/config/kernel-acl.m4 b/config/kernel-acl.m4 index 3ae5dc6b6d..082293428f 100644 --- a/config/kernel-acl.m4 +++ b/config/kernel-acl.m4 @@ -107,30 +107,6 @@ AC_DEFUN([ZFS_AC_KERNEL_POSIX_ACL_CHMOD], [ ]) ]) -dnl # -dnl # 3.1 API change, -dnl # posix_acl_equiv_mode now wants an umode_t instead of a mode_t -dnl # -AC_DEFUN([ZFS_AC_KERNEL_SRC_POSIX_ACL_EQUIV_MODE_WANTS_UMODE_T], [ - ZFS_LINUX_TEST_SRC([posix_acl_equiv_mode], [ - #include - #include - ],[ - umode_t tmp; - posix_acl_equiv_mode(NULL, &tmp); - ]) -]) - -AC_DEFUN([ZFS_AC_KERNEL_POSIX_ACL_EQUIV_MODE_WANTS_UMODE_T], [ - AC_MSG_CHECKING([whether posix_acl_equiv_mode() wants umode_t]) - ZFS_LINUX_TEST_RESULT([posix_acl_equiv_mode], [ - AC_MSG_RESULT(yes) - ],[ - ZFS_LINUX_TEST_ERROR([posix_acl_equiv_mode()]) - ]) -]) - -dnl # dnl # 4.8 API change, dnl # The function posix_acl_valid now must be passed a namespace. dnl # @@ -374,7 +350,6 @@ AC_DEFUN([ZFS_AC_KERNEL_SRC_ACL], [ ZFS_AC_KERNEL_SRC_POSIX_ACL_RELEASE ZFS_AC_KERNEL_SRC_SET_CACHED_ACL_USABLE ZFS_AC_KERNEL_SRC_POSIX_ACL_CHMOD - ZFS_AC_KERNEL_SRC_POSIX_ACL_EQUIV_MODE_WANTS_UMODE_T ZFS_AC_KERNEL_SRC_POSIX_ACL_VALID_WITH_NS ZFS_AC_KERNEL_SRC_INODE_OPERATIONS_GET_ACL ZFS_AC_KERNEL_SRC_INODE_OPERATIONS_SET_ACL @@ -386,7 +361,6 @@ AC_DEFUN([ZFS_AC_KERNEL_ACL], [ ZFS_AC_KERNEL_POSIX_ACL_RELEASE ZFS_AC_KERNEL_SET_CACHED_ACL_USABLE ZFS_AC_KERNEL_POSIX_ACL_CHMOD - ZFS_AC_KERNEL_POSIX_ACL_EQUIV_MODE_WANTS_UMODE_T ZFS_AC_KERNEL_POSIX_ACL_VALID_WITH_NS ZFS_AC_KERNEL_INODE_OPERATIONS_GET_ACL ZFS_AC_KERNEL_INODE_OPERATIONS_SET_ACL diff --git a/config/kernel-automount.m4 b/config/kernel-automount.m4 deleted file mode 100644 index 52f1931b74..0000000000 --- a/config/kernel-automount.m4 +++ /dev/null @@ -1,25 +0,0 @@ -dnl # -dnl # 2.6.37 API change -dnl # The dops->d_automount() dentry operation was added as a clean -dnl # solution to handling automounts. Prior to this cifs/nfs clients -dnl # which required automount support would abuse the follow_link() -dnl # operation on directories for this purpose. -dnl # -AC_DEFUN([ZFS_AC_KERNEL_SRC_AUTOMOUNT], [ - ZFS_LINUX_TEST_SRC([dentry_operations_d_automount], [ - #include - static struct vfsmount *d_automount(struct path *p) { return NULL; } - struct dentry_operations dops __attribute__ ((unused)) = { - .d_automount = d_automount, - }; - ]) -]) - -AC_DEFUN([ZFS_AC_KERNEL_AUTOMOUNT], [ - AC_MSG_CHECKING([whether dops->d_automount() exists]) - ZFS_LINUX_TEST_RESULT([dentry_operations_d_automount], [ - AC_MSG_RESULT(yes) - ],[ - ZFS_LINUX_TEST_ERROR([dops->d_automount()]) - ]) -]) diff --git a/config/kernel-bio.m4 b/config/kernel-bio.m4 index b22c1a3de7..4903a48ae7 100644 --- a/config/kernel-bio.m4 +++ b/config/kernel-bio.m4 @@ -1,6 +1,5 @@ dnl # dnl # 2.6.36 API change, -dnl # REQ_FAILFAST_{DEV|TRANSPORT|DRIVER} dnl # REQ_DISCARD dnl # REQ_FLUSH dnl # @@ -8,13 +7,6 @@ dnl # 4.8 - 4.9 API, dnl # REQ_FLUSH was renamed to REQ_PREFLUSH dnl # AC_DEFUN([ZFS_AC_KERNEL_SRC_REQ], [ - ZFS_LINUX_TEST_SRC([req_failfast_mask], [ - #include - ],[ - int flags __attribute__ ((unused)); - flags = REQ_FAILFAST_MASK; - ]) - ZFS_LINUX_TEST_SRC([req_discard], [ #include ],[ @@ -37,15 +29,6 @@ AC_DEFUN([ZFS_AC_KERNEL_SRC_REQ], [ ]) ]) -AC_DEFUN([ZFS_AC_KERNEL_BIO_REQ_FAILFAST_MASK], [ - AC_MSG_CHECKING([whether REQ_FAILFAST_MASK is defined]) - ZFS_LINUX_TEST_RESULT([req_failfast_mask], [ - AC_MSG_RESULT(yes) - ],[ - ZFS_LINUX_TEST_ERROR([REQ_FAILFAST_MASK]) - ]) -]) - AC_DEFUN([ZFS_AC_KERNEL_BIO_REQ_DISCARD], [ AC_MSG_CHECKING([whether REQ_DISCARD is defined]) ZFS_LINUX_TEST_RESULT([req_discard], [ @@ -336,27 +319,6 @@ AC_DEFUN([ZFS_AC_KERNEL_BIO_SUBMIT_BIO], [ ]) ]) -dnl # -dnl # 2.6.34 API change -dnl # current->bio_list -dnl # -AC_DEFUN([ZFS_AC_KERNEL_SRC_BIO_CURRENT_BIO_LIST], [ - ZFS_LINUX_TEST_SRC([current_bio_list], [ - #include - ], [ - current->bio_list = (struct bio_list *) NULL; - ]) -]) - -AC_DEFUN([ZFS_AC_KERNEL_BIO_CURRENT_BIO_LIST], [ - AC_MSG_CHECKING([whether current->bio_list exists]) - ZFS_LINUX_TEST_RESULT([current_bio_list], [ - AC_MSG_RESULT(yes) - ],[ - ZFS_LINUX_TEST_ERROR([bio_list]) - ]) -]) - dnl # dnl # Linux 5.5 API, dnl # @@ -517,7 +479,6 @@ AC_DEFUN([ZFS_AC_KERNEL_SRC_BIO], [ ZFS_AC_KERNEL_SRC_BIO_BI_STATUS ZFS_AC_KERNEL_SRC_BIO_BVEC_ITER ZFS_AC_KERNEL_SRC_BIO_SUBMIT_BIO - ZFS_AC_KERNEL_SRC_BIO_CURRENT_BIO_LIST ZFS_AC_KERNEL_SRC_BLKG_TRYGET ZFS_AC_KERNEL_SRC_BIO_BDEV_DISK ZFS_AC_KERNEL_SRC_BDEV_SUBMIT_BIO_RETURNS_VOID @@ -527,7 +488,6 @@ AC_DEFUN([ZFS_AC_KERNEL_SRC_BIO], [ ]) AC_DEFUN([ZFS_AC_KERNEL_BIO], [ - ZFS_AC_KERNEL_BIO_REQ_FAILFAST_MASK ZFS_AC_KERNEL_BIO_REQ_DISCARD ZFS_AC_KERNEL_BIO_REQ_FLUSH ZFS_AC_KERNEL_BIO_REQ_PREFLUSH @@ -543,7 +503,6 @@ AC_DEFUN([ZFS_AC_KERNEL_BIO], [ ZFS_AC_KERNEL_BIO_BI_STATUS ZFS_AC_KERNEL_BIO_BVEC_ITER ZFS_AC_KERNEL_BIO_SUBMIT_BIO - ZFS_AC_KERNEL_BIO_CURRENT_BIO_LIST ZFS_AC_KERNEL_BLKG_TRYGET ZFS_AC_KERNEL_BIO_BDEV_DISK ZFS_AC_KERNEL_BDEV_SUBMIT_BIO_RETURNS_VOID diff --git a/config/kernel-blk-queue.m4 b/config/kernel-blk-queue.m4 index 2f0b386e66..fec182a4de 100644 --- a/config/kernel-blk-queue.m4 +++ b/config/kernel-blk-queue.m4 @@ -1,27 +1,3 @@ -dnl # -dnl # 2.6.39 API change, -dnl # blk_start_plug() and blk_finish_plug() -dnl # -AC_DEFUN([ZFS_AC_KERNEL_SRC_BLK_QUEUE_PLUG], [ - ZFS_LINUX_TEST_SRC([blk_plug], [ - #include - ],[ - struct blk_plug plug __attribute__ ((unused)); - - blk_start_plug(&plug); - blk_finish_plug(&plug); - ]) -]) - -AC_DEFUN([ZFS_AC_KERNEL_BLK_QUEUE_PLUG], [ - AC_MSG_CHECKING([whether struct blk_plug is available]) - ZFS_LINUX_TEST_RESULT([blk_plug], [ - AC_MSG_RESULT(yes) - ],[ - ZFS_LINUX_TEST_ERROR([blk_plug]) - ]) -]) - dnl # dnl # 2.6.32 - 4.11: statically allocated bdi in request_queue dnl # 4.12: dynamically allocated bdi in request_queue @@ -405,7 +381,6 @@ AC_DEFUN([ZFS_AC_KERNEL_BLK_MQ], [ ]) AC_DEFUN([ZFS_AC_KERNEL_SRC_BLK_QUEUE], [ - ZFS_AC_KERNEL_SRC_BLK_QUEUE_PLUG ZFS_AC_KERNEL_SRC_BLK_QUEUE_BDI ZFS_AC_KERNEL_SRC_BLK_QUEUE_UPDATE_READAHEAD ZFS_AC_KERNEL_SRC_BLK_QUEUE_DISCARD @@ -419,7 +394,6 @@ AC_DEFUN([ZFS_AC_KERNEL_SRC_BLK_QUEUE], [ ]) AC_DEFUN([ZFS_AC_KERNEL_BLK_QUEUE], [ - ZFS_AC_KERNEL_BLK_QUEUE_PLUG ZFS_AC_KERNEL_BLK_QUEUE_BDI ZFS_AC_KERNEL_BLK_QUEUE_UPDATE_READAHEAD ZFS_AC_KERNEL_BLK_QUEUE_DISCARD diff --git a/config/kernel-blkdev.m4 b/config/kernel-blkdev.m4 index 4f60f96acb..e330cca9ad 100644 --- a/config/kernel-blkdev.m4 +++ b/config/kernel-blkdev.m4 @@ -370,29 +370,6 @@ AC_DEFUN([ZFS_AC_KERNEL_BLKDEV_BDEV_CHECK_MEDIA_CHANGE], [ ]) ]) -dnl # -dnl # 2.6.22 API change -dnl # Single argument invalidate_bdev() -dnl # -AC_DEFUN([ZFS_AC_KERNEL_SRC_BLKDEV_INVALIDATE_BDEV], [ - ZFS_LINUX_TEST_SRC([invalidate_bdev], [ - #include - #include - ],[ - struct block_device *bdev = NULL; - invalidate_bdev(bdev); - ]) -]) - -AC_DEFUN([ZFS_AC_KERNEL_BLKDEV_INVALIDATE_BDEV], [ - AC_MSG_CHECKING([whether invalidate_bdev() exists]) - ZFS_LINUX_TEST_RESULT([invalidate_bdev], [ - AC_MSG_RESULT(yes) - ],[ - ZFS_LINUX_TEST_ERROR([invalidate_bdev()]) - ]) -]) - dnl # dnl # 5.11 API, lookup_bdev() takes dev_t argument. dnl # 2.6.27 API, lookup_bdev() was first exported. @@ -461,56 +438,6 @@ AC_DEFUN([ZFS_AC_KERNEL_BLKDEV_LOOKUP_BDEV], [ ]) ]) -dnl # -dnl # 2.6.30 API change -dnl # -dnl # The bdev_physical_block_size() interface was added to provide a way -dnl # to determine the smallest write which can be performed without a -dnl # read-modify-write operation. -dnl # -dnl # Unfortunately, this interface isn't entirely reliable because -dnl # drives are sometimes known to misreport this value. -dnl # -AC_DEFUN([ZFS_AC_KERNEL_SRC_BLKDEV_BDEV_PHYSICAL_BLOCK_SIZE], [ - ZFS_LINUX_TEST_SRC([bdev_physical_block_size], [ - #include - ],[ - struct block_device *bdev __attribute__ ((unused)) = NULL; - bdev_physical_block_size(bdev); - ]) -]) - -AC_DEFUN([ZFS_AC_KERNEL_BLKDEV_BDEV_PHYSICAL_BLOCK_SIZE], [ - AC_MSG_CHECKING([whether bdev_physical_block_size() is available]) - ZFS_LINUX_TEST_RESULT([bdev_physical_block_size], [ - AC_MSG_RESULT(yes) - ],[ - ZFS_LINUX_TEST_ERROR([bdev_physical_block_size()]) - ]) -]) - -dnl # -dnl # 2.6.30 API change -dnl # Added bdev_logical_block_size(). -dnl # -AC_DEFUN([ZFS_AC_KERNEL_SRC_BLKDEV_BDEV_LOGICAL_BLOCK_SIZE], [ - ZFS_LINUX_TEST_SRC([bdev_logical_block_size], [ - #include - ],[ - struct block_device *bdev __attribute__ ((unused)) = NULL; - bdev_logical_block_size(bdev); - ]) -]) - -AC_DEFUN([ZFS_AC_KERNEL_BLKDEV_BDEV_LOGICAL_BLOCK_SIZE], [ - AC_MSG_CHECKING([whether bdev_logical_block_size() is available]) - ZFS_LINUX_TEST_RESULT([bdev_logical_block_size], [ - AC_MSG_RESULT(yes) - ],[ - ZFS_LINUX_TEST_ERROR([bdev_logical_block_size()]) - ]) -]) - dnl # dnl # 5.11 API change dnl # Added bdev_whole() helper. @@ -764,10 +691,7 @@ AC_DEFUN([ZFS_AC_KERNEL_SRC_BLKDEV], [ ZFS_AC_KERNEL_SRC_BLKDEV_PUT_HOLDER ZFS_AC_KERNEL_SRC_BLKDEV_BDEV_RELEASE ZFS_AC_KERNEL_SRC_BLKDEV_REREAD_PART - ZFS_AC_KERNEL_SRC_BLKDEV_INVALIDATE_BDEV ZFS_AC_KERNEL_SRC_BLKDEV_LOOKUP_BDEV - ZFS_AC_KERNEL_SRC_BLKDEV_BDEV_LOGICAL_BLOCK_SIZE - ZFS_AC_KERNEL_SRC_BLKDEV_BDEV_PHYSICAL_BLOCK_SIZE ZFS_AC_KERNEL_SRC_BLKDEV_CHECK_DISK_CHANGE ZFS_AC_KERNEL_SRC_BLKDEV_BDEV_CHECK_MEDIA_CHANGE ZFS_AC_KERNEL_SRC_BLKDEV_BDEV_WHOLE @@ -785,10 +709,7 @@ AC_DEFUN([ZFS_AC_KERNEL_BLKDEV], [ ZFS_AC_KERNEL_BLKDEV_GET_BY_PATH ZFS_AC_KERNEL_BLKDEV_PUT ZFS_AC_KERNEL_BLKDEV_REREAD_PART - ZFS_AC_KERNEL_BLKDEV_INVALIDATE_BDEV ZFS_AC_KERNEL_BLKDEV_LOOKUP_BDEV - ZFS_AC_KERNEL_BLKDEV_BDEV_LOGICAL_BLOCK_SIZE - ZFS_AC_KERNEL_BLKDEV_BDEV_PHYSICAL_BLOCK_SIZE ZFS_AC_KERNEL_BLKDEV_CHECK_DISK_CHANGE ZFS_AC_KERNEL_BLKDEV_BDEV_CHECK_MEDIA_CHANGE ZFS_AC_KERNEL_BLKDEV_BDEV_WHOLE diff --git a/config/kernel-block-device-operations.m4 b/config/kernel-block-device-operations.m4 index 4ff20b9c41..2fa5d5102a 100644 --- a/config/kernel-block-device-operations.m4 +++ b/config/kernel-block-device-operations.m4 @@ -1,32 +1,3 @@ -dnl # -dnl # 2.6.38 API change -dnl # -AC_DEFUN([ZFS_AC_KERNEL_SRC_BLOCK_DEVICE_OPERATIONS_CHECK_EVENTS], [ - ZFS_LINUX_TEST_SRC([block_device_operations_check_events], [ - #include - - static unsigned int blk_check_events(struct gendisk *disk, - unsigned int clearing) { - (void) disk, (void) clearing; - return (0); - } - - static const struct block_device_operations - bops __attribute__ ((unused)) = { - .check_events = blk_check_events, - }; - ], [], []) -]) - -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) - ],[ - ZFS_LINUX_TEST_ERROR([bops->check_events()]) - ]) -]) - dnl # dnl # 3.10.x API change dnl # @@ -120,14 +91,12 @@ 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_1ARG 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 ]) diff --git a/config/kernel-commit-metadata.m4 b/config/kernel-commit-metadata.m4 deleted file mode 100644 index 49bffbf609..0000000000 --- a/config/kernel-commit-metadata.m4 +++ /dev/null @@ -1,24 +0,0 @@ -dnl # -dnl # 2.6.33 API change -dnl # Added eops->commit_metadata() callback to allow the underlying -dnl # filesystem to determine the most efficient way to commit the inode. -dnl # Prior to this the nfs server would issue an explicit fsync(). -dnl # -AC_DEFUN([ZFS_AC_KERNEL_SRC_COMMIT_METADATA], [ - ZFS_LINUX_TEST_SRC([export_operations_commit_metadata], [ - #include - static int commit_metadata(struct inode *inode) { return 0; } - static struct export_operations eops __attribute__ ((unused))={ - .commit_metadata = commit_metadata, - }; - ],[]) -]) - -AC_DEFUN([ZFS_AC_KERNEL_COMMIT_METADATA], [ - AC_MSG_CHECKING([whether eops->commit_metadata() exists]) - ZFS_LINUX_TEST_RESULT([export_operations_commit_metadata], [ - AC_MSG_RESULT(yes) - ],[ - ZFS_LINUX_TEST_ERROR([eops->commit_metadata()]) - ]) -]) diff --git a/config/kernel-dentry-operations.m4 b/config/kernel-dentry-operations.m4 index 957ebc9f05..f4bfda4f4d 100644 --- a/config/kernel-dentry-operations.m4 +++ b/config/kernel-dentry-operations.m4 @@ -21,28 +21,6 @@ AC_DEFUN([ZFS_AC_KERNEL_D_MAKE_ROOT], [ ]) ]) -dnl # -dnl # 2.6.28 API change -dnl # Added d_obtain_alias() helper function. -dnl # -AC_DEFUN([ZFS_AC_KERNEL_SRC_D_OBTAIN_ALIAS], [ - ZFS_LINUX_TEST_SRC([d_obtain_alias], [ - #include - ], [ - d_obtain_alias(NULL); - ]) -]) - -AC_DEFUN([ZFS_AC_KERNEL_D_OBTAIN_ALIAS], [ - AC_MSG_CHECKING([whether d_obtain_alias() is available]) - ZFS_LINUX_TEST_RESULT_SYMBOL([d_obtain_alias], - [d_obtain_alias], [fs/dcache.c], [ - AC_MSG_RESULT(yes) - ], [ - ZFS_LINUX_TEST_ERROR([d_obtain_alias()]) - ]) -]) - dnl # dnl # 2.6.12 API change dnl # d_prune_aliases() helper function available. @@ -68,28 +46,6 @@ AC_DEFUN([ZFS_AC_KERNEL_D_PRUNE_ALIASES], [ ]) ]) -dnl # -dnl # 2.6.38 API change -dnl # Added d_set_d_op() helper function. -dnl # -AC_DEFUN([ZFS_AC_KERNEL_SRC_D_SET_D_OP], [ - ZFS_LINUX_TEST_SRC([d_set_d_op], [ - #include - ], [ - d_set_d_op(NULL, NULL); - ]) -]) - -AC_DEFUN([ZFS_AC_KERNEL_D_SET_D_OP], [ - AC_MSG_CHECKING([whether d_set_d_op() is available]) - ZFS_LINUX_TEST_RESULT_SYMBOL([d_set_d_op], - [d_set_d_op], [fs/dcache.c], [ - AC_MSG_RESULT(yes) - ], [ - ZFS_LINUX_TEST_ERROR([d_set_d_op]) - ]) -]) - dnl # dnl # 3.6 API change dnl # @@ -119,42 +75,14 @@ AC_DEFUN([ZFS_AC_KERNEL_D_REVALIDATE_NAMEIDATA], [ ]) ]) -dnl # -dnl # 2.6.38 API change -dnl # Added sb->s_d_op default dentry_operations member -dnl # -AC_DEFUN([ZFS_AC_KERNEL_SRC_S_D_OP], [ - ZFS_LINUX_TEST_SRC([super_block_s_d_op], [ - #include - ],[ - struct super_block sb __attribute__ ((unused)); - sb.s_d_op = NULL; - ]) -]) - -AC_DEFUN([ZFS_AC_KERNEL_S_D_OP], [ - AC_MSG_CHECKING([whether super_block has s_d_op]) - ZFS_LINUX_TEST_RESULT([super_block_s_d_op], [ - AC_MSG_RESULT(yes) - ], [ - ZFS_LINUX_TEST_ERROR([super_block s_d_op]) - ]) -]) - AC_DEFUN([ZFS_AC_KERNEL_SRC_DENTRY], [ ZFS_AC_KERNEL_SRC_D_MAKE_ROOT - ZFS_AC_KERNEL_SRC_D_OBTAIN_ALIAS ZFS_AC_KERNEL_SRC_D_PRUNE_ALIASES - ZFS_AC_KERNEL_SRC_D_SET_D_OP ZFS_AC_KERNEL_SRC_D_REVALIDATE_NAMEIDATA - ZFS_AC_KERNEL_SRC_S_D_OP ]) AC_DEFUN([ZFS_AC_KERNEL_DENTRY], [ ZFS_AC_KERNEL_D_MAKE_ROOT - ZFS_AC_KERNEL_D_OBTAIN_ALIAS ZFS_AC_KERNEL_D_PRUNE_ALIASES - ZFS_AC_KERNEL_D_SET_D_OP ZFS_AC_KERNEL_D_REVALIDATE_NAMEIDATA - ZFS_AC_KERNEL_S_D_OP ]) diff --git a/config/kernel-discard-granularity.m4 b/config/kernel-discard-granularity.m4 deleted file mode 100644 index 61326e6773..0000000000 --- a/config/kernel-discard-granularity.m4 +++ /dev/null @@ -1,21 +0,0 @@ -dnl # -dnl # 2.6.33 API change -dnl # Discard granularity and alignment restrictions may now be set. -dnl # -AC_DEFUN([ZFS_AC_KERNEL_SRC_DISCARD_GRANULARITY], [ - ZFS_LINUX_TEST_SRC([discard_granularity], [ - #include - ],[ - struct queue_limits ql __attribute__ ((unused)); - ql.discard_granularity = 0; - ]) -]) - -AC_DEFUN([ZFS_AC_KERNEL_DISCARD_GRANULARITY], [ - AC_MSG_CHECKING([whether ql->discard_granularity is available]) - ZFS_LINUX_TEST_RESULT([discard_granularity], [ - AC_MSG_RESULT(yes) - ],[ - ZFS_LINUX_TEST_ERROR([ql->discard_granularity]) - ]) -]) diff --git a/config/kernel-fmode-t.m4 b/config/kernel-fmode-t.m4 deleted file mode 100644 index 5f111e21b4..0000000000 --- a/config/kernel-fmode-t.m4 +++ /dev/null @@ -1,20 +0,0 @@ -dnl # -dnl # 2.6.28 API change, -dnl # check if fmode_t typedef is defined -dnl # -AC_DEFUN([ZFS_AC_KERNEL_SRC_FMODE_T], [ - ZFS_LINUX_TEST_SRC([type_fmode_t], [ - #include - ],[ - fmode_t *ptr __attribute__ ((unused)); - ]) -]) - -AC_DEFUN([ZFS_AC_KERNEL_FMODE_T], [ - AC_MSG_CHECKING([whether kernel defines fmode_t]) - ZFS_LINUX_TEST_RESULT([type_fmode_t], [ - AC_MSG_RESULT([yes]) - ],[ - ZFS_LINUX_TEST_ERROR([type_fmode_t]) - ]) -]) diff --git a/config/kernel-follow-down-one.m4 b/config/kernel-follow-down-one.m4 deleted file mode 100644 index 38c460d350..0000000000 --- a/config/kernel-follow-down-one.m4 +++ /dev/null @@ -1,22 +0,0 @@ -dnl # -dnl # 2.6.38 API change -dnl # follow_down() renamed follow_down_one(). The original follow_down() -dnl # symbol still exists but will traverse down all the layers. -dnl # -AC_DEFUN([ZFS_AC_KERNEL_SRC_FOLLOW_DOWN_ONE], [ - ZFS_LINUX_TEST_SRC([follow_down_one], [ - #include - ],[ - struct path *p = NULL; - follow_down_one(p); - ]) -]) - -AC_DEFUN([ZFS_AC_KERNEL_FOLLOW_DOWN_ONE], [ - AC_MSG_CHECKING([whether follow_down_one() is available]) - ZFS_LINUX_TEST_RESULT([follow_down_one], [ - AC_MSG_RESULT(yes) - ],[ - ZFS_LINUX_TEST_ERROR([follow_down_one()]) - ]) -]) diff --git a/config/kernel-fst-mount.m4 b/config/kernel-fst-mount.m4 deleted file mode 100644 index 576f5f0129..0000000000 --- a/config/kernel-fst-mount.m4 +++ /dev/null @@ -1,30 +0,0 @@ -dnl # -dnl # 2.6.38 API change -dnl # The .get_sb callback has been replaced by a .mount callback -dnl # in the file_system_type structure. -dnl # -AC_DEFUN([ZFS_AC_KERNEL_SRC_FST_MOUNT], [ - ZFS_LINUX_TEST_SRC([file_system_type_mount], [ - #include - - static struct dentry * - mount(struct file_system_type *fs_type, int flags, - const char *osname, void *data) { - struct dentry *d = NULL; - return (d); - } - - static struct file_system_type fst __attribute__ ((unused)) = { - .mount = mount, - }; - ],[]) -]) - -AC_DEFUN([ZFS_AC_KERNEL_FST_MOUNT], [ - AC_MSG_CHECKING([whether fst->mount() exists]) - ZFS_LINUX_TEST_RESULT([file_system_type_mount], [ - AC_MSG_RESULT(yes) - ],[ - ZFS_LINUX_TEST_ERROR([fst->mount()]) - ]) -]) diff --git a/config/kernel-get-disk-ro.m4 b/config/kernel-get-disk-ro.m4 deleted file mode 100644 index acfcb69acc..0000000000 --- a/config/kernel-get-disk-ro.m4 +++ /dev/null @@ -1,20 +0,0 @@ -dnl # -dnl # 2.6.x API change -dnl # -AC_DEFUN([ZFS_AC_KERNEL_SRC_GET_DISK_RO], [ - ZFS_LINUX_TEST_SRC([get_disk_ro], [ - #include - ],[ - struct gendisk *disk __attribute__ ((unused)) = NULL; - (void) get_disk_ro(disk); - ], []) -]) - -AC_DEFUN([ZFS_AC_KERNEL_GET_DISK_RO], [ - AC_MSG_CHECKING([whether get_disk_ro() is available]) - ZFS_LINUX_TEST_RESULT([get_disk_ro], [ - AC_MSG_RESULT(yes) - ],[ - ZFS_LINUX_TEST_ERROR([get_disk_ro()]) - ]) -]) diff --git a/config/kernel-inode-lookup.m4 b/config/kernel-inode-lookup.m4 deleted file mode 100644 index c737305642..0000000000 --- a/config/kernel-inode-lookup.m4 +++ /dev/null @@ -1,26 +0,0 @@ -dnl # -dnl # 3.6 API change -dnl # -AC_DEFUN([ZFS_AC_KERNEL_SRC_LOOKUP_FLAGS], [ - ZFS_LINUX_TEST_SRC([lookup_flags], [ - #include - #include - - static struct dentry *inode_lookup(struct inode *inode, - struct dentry *dentry, unsigned int flags) { return NULL; } - - static const struct inode_operations iops - __attribute__ ((unused)) = { - .lookup = inode_lookup, - }; - ],[]) -]) - -AC_DEFUN([ZFS_AC_KERNEL_LOOKUP_FLAGS], [ - AC_MSG_CHECKING([whether iops->lookup() passes flags]) - ZFS_LINUX_TEST_RESULT([lookup_flags], [ - AC_MSG_RESULT(yes) - ],[ - ZFS_LINUX_TEST_ERROR([iops->lookup()]) - ]) -]) diff --git a/config/kernel-insert-inode-locked.m4 b/config/kernel-insert-inode-locked.m4 deleted file mode 100644 index 348aff9a57..0000000000 --- a/config/kernel-insert-inode-locked.m4 +++ /dev/null @@ -1,21 +0,0 @@ -dnl # -dnl # 2.6.28 API change -dnl # Added insert_inode_locked() helper function. -dnl # -AC_DEFUN([ZFS_AC_KERNEL_SRC_INSERT_INODE_LOCKED], [ - ZFS_LINUX_TEST_SRC([insert_inode_locked], [ - #include - ], [ - insert_inode_locked(NULL); - ]) -]) - -AC_DEFUN([ZFS_AC_KERNEL_INSERT_INODE_LOCKED], [ - AC_MSG_CHECKING([whether insert_inode_locked() is available]) - ZFS_LINUX_TEST_RESULT_SYMBOL([insert_inode_locked], - [insert_inode_locked], [fs/inode.c], [ - AC_MSG_RESULT(yes) - ], [ - ZFS_LINUX_TEST_ERROR([insert_inode_locked()]) - ]) -]) diff --git a/config/kernel-kmap-atomic-args.m4 b/config/kernel-kmap-atomic-args.m4 deleted file mode 100644 index 1172505afc..0000000000 --- a/config/kernel-kmap-atomic-args.m4 +++ /dev/null @@ -1,22 +0,0 @@ -dnl # -dnl # 2.6.37 API change -dnl # kmap_atomic changed from assigning hard-coded named slot to using -dnl # push/pop based dynamical allocation. -dnl # -AC_DEFUN([ZFS_AC_KERNEL_SRC_KMAP_ATOMIC_ARGS], [ - ZFS_LINUX_TEST_SRC([kmap_atomic], [ - #include - ],[ - struct page page; - kmap_atomic(&page); - ]) -]) - -AC_DEFUN([ZFS_AC_KERNEL_KMAP_ATOMIC_ARGS], [ - AC_MSG_CHECKING([whether kmap_atomic wants 1 args]) - ZFS_LINUX_TEST_RESULT([kmap_atomic], [ - AC_MSG_RESULT(yes) - ],[ - ZFS_LINUX_TEST_ERROR([kmap_atomic()]) - ]) -]) diff --git a/config/kernel-kuid-helpers.m4 b/config/kernel-kuid-helpers.m4 deleted file mode 100644 index 38a439fa6e..0000000000 --- a/config/kernel-kuid-helpers.m4 +++ /dev/null @@ -1,24 +0,0 @@ -dnl # -dnl # 3.5 API change, -dnl # Since usernamespaces were introduced in kernel version 3.5, it -dnl # became necessary to go through one more level of indirection -dnl # when dealing with uid/gid - namely the kuid type. -dnl # -dnl # -AC_DEFUN([ZFS_AC_KERNEL_SRC_KUID_HELPERS], [ - ZFS_LINUX_TEST_SRC([i_uid_read], [ - #include - ],[ - struct inode *ip = NULL; - (void) i_uid_read(ip); - ]) -]) - -AC_DEFUN([ZFS_AC_KERNEL_KUID_HELPERS], [ - AC_MSG_CHECKING([whether i_(uid|gid)_(read|write) exist]) - ZFS_LINUX_TEST_RESULT([i_uid_read], [ - AC_MSG_RESULT(yes) - ],[ - ZFS_LINUX_TEST_ERROR([i_uid_read]) - ]) -]) diff --git a/config/kernel-kuidgid.m4 b/config/kernel-kuidgid.m4 deleted file mode 100644 index b7e441408c..0000000000 --- a/config/kernel-kuidgid.m4 +++ /dev/null @@ -1,21 +0,0 @@ -dnl # -dnl # 3.8 API change, -dnl # User namespaces, use kuid_t in place of uid_t where available. -dnl # -AC_DEFUN([ZFS_AC_KERNEL_SRC_KUIDGID_T], [ - ZFS_LINUX_TEST_SRC([kuidgid_t], [ - #include - ], [ - kuid_t userid __attribute__ ((unused)) = KUIDT_INIT(0); - kgid_t groupid __attribute__ ((unused)) = KGIDT_INIT(0); - ]) -]) - -AC_DEFUN([ZFS_AC_KERNEL_KUIDGID_T], [ - AC_MSG_CHECKING([whether kuid_t/kgid_t is available]) - ZFS_LINUX_TEST_RESULT([kuidgid_t], [ - AC_MSG_RESULT(yes) - ],[ - ZFS_LINUX_TEST_ERROR([kuid_t/kgid_t]) - ]) -]) diff --git a/config/kernel-sched.m4 b/config/kernel-sched.m4 index 17e49fbdf4..4df1c50e23 100644 --- a/config/kernel-sched.m4 +++ b/config/kernel-sched.m4 @@ -1,25 +1,3 @@ -dnl # -dnl # 3.9 API change, -dnl # Moved things from linux/sched.h to linux/sched/rt.h -dnl # -AC_DEFUN([ZFS_AC_KERNEL_SRC_SCHED_RT_HEADER], [ - ZFS_LINUX_TEST_SRC([sched_rt_header], [ - #include - #include - ],[ - return 0; - ]) -]) - -AC_DEFUN([ZFS_AC_KERNEL_SCHED_RT_HEADER], [ - AC_MSG_CHECKING([whether header linux/sched/rt.h exists]) - ZFS_LINUX_TEST_RESULT([sched_rt_header], [ - AC_MSG_RESULT(yes) - ],[ - ZFS_LINUX_TEST_ERROR([sched_rt_header]) - ]) -]) - dnl # dnl # 4.11 API change, dnl # Moved things from linux/sched.h to linux/sched/signal.h @@ -70,13 +48,11 @@ AC_DEFUN([ZFS_AC_KERNEL_IO_SCHEDULE_TIMEOUT], [ ]) AC_DEFUN([ZFS_AC_KERNEL_SRC_SCHED], [ - ZFS_AC_KERNEL_SRC_SCHED_RT_HEADER ZFS_AC_KERNEL_SRC_SCHED_SIGNAL_HEADER ZFS_AC_KERNEL_SRC_IO_SCHEDULE_TIMEOUT ]) AC_DEFUN([ZFS_AC_KERNEL_SCHED], [ - ZFS_AC_KERNEL_SCHED_RT_HEADER ZFS_AC_KERNEL_SCHED_SIGNAL_HEADER ZFS_AC_KERNEL_IO_SCHEDULE_TIMEOUT ]) diff --git a/config/kernel-security-inode-init.m4 b/config/kernel-security-inode-init.m4 deleted file mode 100644 index 4e4bfd29b2..0000000000 --- a/config/kernel-security-inode-init.m4 +++ /dev/null @@ -1,36 +0,0 @@ -dnl # -dnl # 3.2 API change -dnl # The security_inode_init_security() API has been changed to include -dnl # a filesystem specific callback to write security extended attributes. -dnl # This was done to support the initialization of multiple LSM xattrs -dnl # and the EVM xattr. -dnl # -AC_DEFUN([ZFS_AC_KERNEL_SRC_SECURITY_INODE_INIT_SECURITY_CALLBACK], [ - ZFS_LINUX_TEST_SRC([security_inode_init_security], [ - #include - ],[ - struct inode *ip __attribute__ ((unused)) = NULL; - struct inode *dip __attribute__ ((unused)) = NULL; - const struct qstr *str __attribute__ ((unused)) = NULL; - initxattrs func __attribute__ ((unused)) = NULL; - - security_inode_init_security(ip, dip, str, func, NULL); - ]) -]) - -AC_DEFUN([ZFS_AC_KERNEL_SECURITY_INODE_INIT_SECURITY_CALLBACK], [ - AC_MSG_CHECKING([whether security_inode_init_security wants callback]) - ZFS_LINUX_TEST_RESULT([security_inode_init_security], [ - AC_MSG_RESULT(yes) - ],[ - ZFS_LINUX_TEST_ERROR([security_inode_init_security callback]) - ]) -]) - -AC_DEFUN([ZFS_AC_KERNEL_SRC_SECURITY_INODE], [ - ZFS_AC_KERNEL_SRC_SECURITY_INODE_INIT_SECURITY_CALLBACK -]) - -AC_DEFUN([ZFS_AC_KERNEL_SECURITY_INODE], [ - ZFS_AC_KERNEL_SECURITY_INODE_INIT_SECURITY_CALLBACK -]) diff --git a/config/kernel-set-nlink.m4 b/config/kernel-set-nlink.m4 deleted file mode 100644 index fa4f928b27..0000000000 --- a/config/kernel-set-nlink.m4 +++ /dev/null @@ -1,22 +0,0 @@ -dnl # -dnl # Linux 3.2 API change -dnl # set_nlink() -dnl # -AC_DEFUN([ZFS_AC_KERNEL_SRC_SET_NLINK], [ - ZFS_LINUX_TEST_SRC([set_nlink], [ - #include - ],[ - struct inode node; - unsigned int link = 0; - (void) set_nlink(&node, link); - ]) -]) - -AC_DEFUN([ZFS_AC_KERNEL_SET_NLINK], [ - AC_MSG_CHECKING([whether set_nlink() is available]) - ZFS_LINUX_TEST_RESULT([set_nlink], [ - AC_MSG_RESULT(yes) - ],[ - ZFS_LINUX_TEST_ERROR([set_nlink()]) - ]) -]) diff --git a/config/kernel-sget-args.m4 b/config/kernel-sget-args.m4 deleted file mode 100644 index afa62c797d..0000000000 --- a/config/kernel-sget-args.m4 +++ /dev/null @@ -1,25 +0,0 @@ -dnl # -dnl # 3.6 API change, -dnl # 'sget' now takes the mount flags as an argument. -dnl # -AC_DEFUN([ZFS_AC_KERNEL_SRC_SGET], [ - ZFS_LINUX_TEST_SRC([sget_5args], [ - #include - ],[ - struct file_system_type *type = NULL; - int (*test)(struct super_block *,void *) = NULL; - int (*set)(struct super_block *,void *) = NULL; - int flags = 0; - void *data = NULL; - (void) sget(type, test, set, flags, data); - ]) -]) - -AC_DEFUN([ZFS_AC_KERNEL_SGET], [ - AC_MSG_CHECKING([whether sget() wants 5 args]) - ZFS_LINUX_TEST_RESULT([sget_5args], [ - AC_MSG_RESULT(yes) - ],[ - ZFS_LINUX_TEST_ERROR([sget()]) - ]) -]) diff --git a/config/kernel-show-options.m4 b/config/kernel-show-options.m4 deleted file mode 100644 index fd62f30086..0000000000 --- a/config/kernel-show-options.m4 +++ /dev/null @@ -1,25 +0,0 @@ -dnl # -dnl # Linux 3.3 API -dnl # -AC_DEFUN([ZFS_AC_KERNEL_SRC_SHOW_OPTIONS], [ - ZFS_LINUX_TEST_SRC([super_operations_show_options], [ - #include - - static int show_options(struct seq_file * x, struct dentry * y) { - return 0; - }; - - static struct super_operations sops __attribute__ ((unused)) = { - .show_options = show_options, - }; - ],[]) -]) - -AC_DEFUN([ZFS_AC_KERNEL_SHOW_OPTIONS], [ - AC_MSG_CHECKING([whether sops->show_options() wants dentry]) - ZFS_LINUX_TEST_RESULT([super_operations_show_options], [ - AC_MSG_RESULT([yes]) - ],[ - ZFS_LINUX_TEST_ERROR([sops->show_options()]) - ]) -]) diff --git a/config/kernel-truncate-setsize.m4 b/config/kernel-truncate-setsize.m4 deleted file mode 100644 index 76c82ef302..0000000000 --- a/config/kernel-truncate-setsize.m4 +++ /dev/null @@ -1,21 +0,0 @@ -dnl # -dnl # 2.6.35 API change -dnl # Added truncate_setsize() helper function. -dnl # -AC_DEFUN([ZFS_AC_KERNEL_SRC_TRUNCATE_SETSIZE], [ - ZFS_LINUX_TEST_SRC([truncate_setsize], [ - #include - ], [ - truncate_setsize(NULL, 0); - ]) -]) - -AC_DEFUN([ZFS_AC_KERNEL_TRUNCATE_SETSIZE], [ - AC_MSG_CHECKING([whether truncate_setsize() is available]) - ZFS_LINUX_TEST_RESULT_SYMBOL([truncate_setsize], - [truncate_setsize], [mm/truncate.c], [ - AC_MSG_RESULT(yes) - ], [ - ZFS_LINUX_TEST_ERROR([truncate_setsize]) - ]) -]) diff --git a/config/kernel-userns-capabilities.m4 b/config/kernel-userns-capabilities.m4 index 026503623a..a5eea3e5cf 100644 --- a/config/kernel-userns-capabilities.m4 +++ b/config/kernel-userns-capabilities.m4 @@ -1,24 +1,3 @@ -dnl # -dnl # 2.6.38 API change -dnl # ns_capable() was introduced -dnl # -AC_DEFUN([ZFS_AC_KERNEL_SRC_NS_CAPABLE], [ - ZFS_LINUX_TEST_SRC([ns_capable], [ - #include - ],[ - ns_capable((struct user_namespace *)NULL, CAP_SYS_ADMIN); - ]) -]) - -AC_DEFUN([ZFS_AC_KERNEL_NS_CAPABLE], [ - AC_MSG_CHECKING([whether ns_capable exists]) - ZFS_LINUX_TEST_RESULT([ns_capable], [ - AC_MSG_RESULT(yes) - ],[ - ZFS_LINUX_TEST_ERROR([ns_capable()]) - ]) -]) - dnl # dnl # 4.10 API change dnl # has_capability() was exported. @@ -46,61 +25,10 @@ AC_DEFUN([ZFS_AC_KERNEL_HAS_CAPABILITY], [ ]) ]) -dnl # -dnl # 2.6.39 API change -dnl # struct user_namespace was added to struct cred_t as cred->user_ns member -dnl # -AC_DEFUN([ZFS_AC_KERNEL_SRC_CRED_USER_NS], [ - ZFS_LINUX_TEST_SRC([cred_user_ns], [ - #include - ],[ - struct cred cr; - cr.user_ns = (struct user_namespace *)NULL; - ]) -]) - -AC_DEFUN([ZFS_AC_KERNEL_CRED_USER_NS], [ - AC_MSG_CHECKING([whether cred_t->user_ns exists]) - ZFS_LINUX_TEST_RESULT([cred_user_ns], [ - AC_MSG_RESULT(yes) - ],[ - ZFS_LINUX_TEST_ERROR([cred_t->user_ns()]) - ]) -]) - -dnl # -dnl # 3.4 API change -dnl # kuid_has_mapping() and kgid_has_mapping() were added to distinguish -dnl # between internal kernel uids/gids and user namespace uids/gids. -dnl # -AC_DEFUN([ZFS_AC_KERNEL_SRC_KUID_HAS_MAPPING], [ - ZFS_LINUX_TEST_SRC([kuid_has_mapping], [ - #include - ],[ - kuid_has_mapping((struct user_namespace *)NULL, KUIDT_INIT(0)); - kgid_has_mapping((struct user_namespace *)NULL, KGIDT_INIT(0)); - ]) -]) - -AC_DEFUN([ZFS_AC_KERNEL_KUID_HAS_MAPPING], [ - AC_MSG_CHECKING([whether kuid_has_mapping/kgid_has_mapping exist]) - ZFS_LINUX_TEST_RESULT([kuid_has_mapping], [ - AC_MSG_RESULT(yes) - ],[ - ZFS_LINUX_TEST_ERROR([kuid_has_mapping()]) - ]) -]) - AC_DEFUN([ZFS_AC_KERNEL_SRC_USERNS_CAPABILITIES], [ - ZFS_AC_KERNEL_SRC_NS_CAPABLE ZFS_AC_KERNEL_SRC_HAS_CAPABILITY - ZFS_AC_KERNEL_SRC_CRED_USER_NS - ZFS_AC_KERNEL_SRC_KUID_HAS_MAPPING ]) AC_DEFUN([ZFS_AC_KERNEL_USERNS_CAPABILITIES], [ - ZFS_AC_KERNEL_NS_CAPABLE ZFS_AC_KERNEL_HAS_CAPABILITY - ZFS_AC_KERNEL_CRED_USER_NS - ZFS_AC_KERNEL_KUID_HAS_MAPPING ]) diff --git a/config/kernel-usleep_range.m4 b/config/kernel-usleep_range.m4 deleted file mode 100644 index 06eb381a3c..0000000000 --- a/config/kernel-usleep_range.m4 +++ /dev/null @@ -1,23 +0,0 @@ -dnl # -dnl # 2.6.36 API compatibility- Added usleep_range timer. -dnl # -dnl # usleep_range is a finer precision implementation of msleep -dnl # designed to be a drop-in replacement for udelay where a precise -dnl # sleep / busy-wait is unnecessary. -dnl # -AC_DEFUN([ZFS_AC_KERNEL_SRC_USLEEP_RANGE], [ - ZFS_LINUX_TEST_SRC([usleep_range], [ - #include - ],[ - usleep_range(0, 0); - ]) -]) - -AC_DEFUN([ZFS_AC_KERNEL_USLEEP_RANGE], [ - AC_MSG_CHECKING([whether usleep_range() is available]) - ZFS_LINUX_TEST_RESULT([usleep_range], [ - AC_MSG_RESULT(yes) - ],[ - ZFS_LINUX_TEST_ERROR([usleep_range()]) - ]) -]) diff --git a/config/kernel-vfs-fsync.m4 b/config/kernel-vfs-fsync.m4 deleted file mode 100644 index 159efca453..0000000000 --- a/config/kernel-vfs-fsync.m4 +++ /dev/null @@ -1,20 +0,0 @@ -dnl # -dnl # 2.6.35 API change, -dnl # Unused 'struct dentry *' removed from vfs_fsync() prototype. -dnl # -AC_DEFUN([ZFS_AC_KERNEL_SRC_VFS_FSYNC_2ARGS], [ - ZFS_LINUX_TEST_SRC([vfs_fsync_2args], [ - #include - ],[ - vfs_fsync(NULL, 0); - ]) -]) - -AC_DEFUN([ZFS_AC_KERNEL_VFS_FSYNC_2ARGS], [ - AC_MSG_CHECKING([whether vfs_fsync() wants 2 args]) - ZFS_LINUX_TEST_RESULT([vfs_fsync_2args], [ - AC_MSG_RESULT(yes) - ],[ - ZFS_LINUX_TEST_ERROR([vfs_fsync()]) - ]) -]) diff --git a/config/kernel-xattr-handler.m4 b/config/kernel-xattr-handler.m4 index 5d4eb567c4..a3f0c3e1b8 100644 --- a/config/kernel-xattr-handler.m4 +++ b/config/kernel-xattr-handler.m4 @@ -1,38 +1,3 @@ -dnl # -dnl # 2.6.35 API change, -dnl # The 'struct xattr_handler' was constified in the generic -dnl # super_block structure. -dnl # -AC_DEFUN([ZFS_AC_KERNEL_SRC_CONST_XATTR_HANDLER], [ - ZFS_LINUX_TEST_SRC([const_xattr_handler], [ - #include - #include - - const struct xattr_handler xattr_test_handler = { - .prefix = "test", - .get = NULL, - .set = NULL, - }; - - const struct xattr_handler *xattr_handlers[] = { - &xattr_test_handler, - }; - - const struct super_block sb __attribute__ ((unused)) = { - .s_xattr = xattr_handlers, - }; - ],[]) -]) - -AC_DEFUN([ZFS_AC_KERNEL_CONST_XATTR_HANDLER], [ - AC_MSG_CHECKING([whether super_block uses const struct xattr_handler]) - ZFS_LINUX_TEST_RESULT([const_xattr_handler], [ - AC_MSG_RESULT([yes]) - ],[ - ZFS_LINUX_TEST_ERROR([const xattr_handler]) - ]) -]) - dnl # dnl # 4.5 API change, dnl # struct xattr_handler added new member "name". @@ -431,7 +396,6 @@ AC_DEFUN([ZFS_AC_KERNEL_GENERIC_SETXATTR], [ ]) AC_DEFUN([ZFS_AC_KERNEL_SRC_XATTR], [ - ZFS_AC_KERNEL_SRC_CONST_XATTR_HANDLER ZFS_AC_KERNEL_SRC_XATTR_HANDLER_NAME ZFS_AC_KERNEL_SRC_XATTR_HANDLER_GET ZFS_AC_KERNEL_SRC_XATTR_HANDLER_SET @@ -440,7 +404,6 @@ AC_DEFUN([ZFS_AC_KERNEL_SRC_XATTR], [ ]) AC_DEFUN([ZFS_AC_KERNEL_XATTR], [ - ZFS_AC_KERNEL_CONST_XATTR_HANDLER ZFS_AC_KERNEL_XATTR_HANDLER_NAME ZFS_AC_KERNEL_XATTR_HANDLER_GET ZFS_AC_KERNEL_XATTR_HANDLER_SET diff --git a/config/kernel.m4 b/config/kernel.m4 index e92f475c66..9c70182963 100644 --- a/config/kernel.m4 +++ b/config/kernel.m4 @@ -46,7 +46,6 @@ AC_DEFUN([ZFS_AC_KERNEL_TEST_SRC], [ ZFS_AC_KERNEL_SRC_FADVISE ZFS_AC_KERNEL_SRC_GENERIC_FADVISE ZFS_AC_KERNEL_SRC_SCHED - ZFS_AC_KERNEL_SRC_USLEEP_RANGE ZFS_AC_KERNEL_SRC_KMEM_CACHE ZFS_AC_KERNEL_SRC_KVMALLOC ZFS_AC_KERNEL_SRC_VMALLOC_PAGE_KERNEL @@ -64,9 +63,7 @@ AC_DEFUN([ZFS_AC_KERNEL_TEST_SRC], [ ZFS_AC_KERNEL_SRC_BLK_QUEUE ZFS_AC_KERNEL_SRC_GENHD_FLAGS ZFS_AC_KERNEL_SRC_REVALIDATE_DISK - ZFS_AC_KERNEL_SRC_GET_DISK_RO ZFS_AC_KERNEL_SRC_GENERIC_READLINK_GLOBAL - ZFS_AC_KERNEL_SRC_DISCARD_GRANULARITY ZFS_AC_KERNEL_SRC_INODE_OWNER_OR_CAPABLE ZFS_AC_KERNEL_SRC_XATTR ZFS_AC_KERNEL_SRC_ACL @@ -74,7 +71,6 @@ AC_DEFUN([ZFS_AC_KERNEL_TEST_SRC], [ ZFS_AC_KERNEL_SRC_INODE_GETATTR ZFS_AC_KERNEL_SRC_INODE_SET_FLAGS ZFS_AC_KERNEL_SRC_INODE_SET_IVERSION - ZFS_AC_KERNEL_SRC_SHOW_OPTIONS ZFS_AC_KERNEL_SRC_FILE_INODE ZFS_AC_KERNEL_SRC_FILE_DENTRY ZFS_AC_KERNEL_SRC_FSYNC @@ -83,31 +79,21 @@ AC_DEFUN([ZFS_AC_KERNEL_TEST_SRC], [ ZFS_AC_KERNEL_SRC_DIRTY_INODE ZFS_AC_KERNEL_SRC_SHRINKER ZFS_AC_KERNEL_SRC_MKDIR - ZFS_AC_KERNEL_SRC_LOOKUP_FLAGS ZFS_AC_KERNEL_SRC_CREATE ZFS_AC_KERNEL_SRC_PERMISSION ZFS_AC_KERNEL_SRC_GET_LINK ZFS_AC_KERNEL_SRC_PUT_LINK ZFS_AC_KERNEL_SRC_TMPFILE - ZFS_AC_KERNEL_SRC_AUTOMOUNT ZFS_AC_KERNEL_SRC_ENCODE_FH_WITH_INODE - ZFS_AC_KERNEL_SRC_COMMIT_METADATA ZFS_AC_KERNEL_SRC_CLEAR_INODE ZFS_AC_KERNEL_SRC_SETATTR_PREPARE - ZFS_AC_KERNEL_SRC_INSERT_INODE_LOCKED ZFS_AC_KERNEL_SRC_DENTRY ZFS_AC_KERNEL_SRC_DENTRY_ALIAS_D_U - ZFS_AC_KERNEL_SRC_TRUNCATE_SETSIZE - ZFS_AC_KERNEL_SRC_SECURITY_INODE - ZFS_AC_KERNEL_SRC_FST_MOUNT ZFS_AC_KERNEL_SRC_BDI - ZFS_AC_KERNEL_SRC_SET_NLINK - ZFS_AC_KERNEL_SRC_SGET ZFS_AC_KERNEL_SRC_LSEEK_EXECUTE ZFS_AC_KERNEL_SRC_VFS_FILEMAP_DIRTY_FOLIO ZFS_AC_KERNEL_SRC_VFS_READ_FOLIO ZFS_AC_KERNEL_SRC_VFS_GETATTR - ZFS_AC_KERNEL_SRC_VFS_FSYNC_2ARGS ZFS_AC_KERNEL_SRC_VFS_ITERATE ZFS_AC_KERNEL_SRC_VFS_DIRECT_IO ZFS_AC_KERNEL_SRC_VFS_READPAGES @@ -122,15 +108,10 @@ AC_DEFUN([ZFS_AC_KERNEL_TEST_SRC], [ ZFS_AC_KERNEL_SRC_VFS_CLONE_FILE_RANGE ZFS_AC_KERNEL_SRC_VFS_DEDUPE_FILE_RANGE ZFS_AC_KERNEL_SRC_VFS_FILE_OPERATIONS_EXTEND - ZFS_AC_KERNEL_SRC_KMAP_ATOMIC_ARGS ZFS_AC_KERNEL_SRC_KMAP_LOCAL_PAGE - ZFS_AC_KERNEL_SRC_FOLLOW_DOWN_ONE ZFS_AC_KERNEL_SRC_MAKE_REQUEST_FN ZFS_AC_KERNEL_SRC_GENERIC_IO_ACCT ZFS_AC_KERNEL_SRC_FPU - ZFS_AC_KERNEL_SRC_FMODE_T - ZFS_AC_KERNEL_SRC_KUIDGID_T - ZFS_AC_KERNEL_SRC_KUID_HELPERS ZFS_AC_KERNEL_SRC_RENAME ZFS_AC_KERNEL_SRC_CURRENT_TIME ZFS_AC_KERNEL_SRC_USERNS_CAPABILITIES @@ -195,7 +176,6 @@ AC_DEFUN([ZFS_AC_KERNEL_TEST_RESULT], [ ZFS_AC_KERNEL_FADVISE ZFS_AC_KERNEL_GENERIC_FADVISE ZFS_AC_KERNEL_SCHED - ZFS_AC_KERNEL_USLEEP_RANGE ZFS_AC_KERNEL_KMEM_CACHE ZFS_AC_KERNEL_KVMALLOC ZFS_AC_KERNEL_VMALLOC_PAGE_KERNEL @@ -213,9 +193,7 @@ AC_DEFUN([ZFS_AC_KERNEL_TEST_RESULT], [ ZFS_AC_KERNEL_BLK_QUEUE ZFS_AC_KERNEL_GENHD_FLAGS ZFS_AC_KERNEL_REVALIDATE_DISK - ZFS_AC_KERNEL_GET_DISK_RO ZFS_AC_KERNEL_GENERIC_READLINK_GLOBAL - ZFS_AC_KERNEL_DISCARD_GRANULARITY ZFS_AC_KERNEL_INODE_OWNER_OR_CAPABLE ZFS_AC_KERNEL_XATTR ZFS_AC_KERNEL_ACL @@ -223,7 +201,6 @@ AC_DEFUN([ZFS_AC_KERNEL_TEST_RESULT], [ ZFS_AC_KERNEL_INODE_GETATTR ZFS_AC_KERNEL_INODE_SET_FLAGS ZFS_AC_KERNEL_INODE_SET_IVERSION - ZFS_AC_KERNEL_SHOW_OPTIONS ZFS_AC_KERNEL_FILE_INODE ZFS_AC_KERNEL_FILE_DENTRY ZFS_AC_KERNEL_FSYNC @@ -232,31 +209,21 @@ AC_DEFUN([ZFS_AC_KERNEL_TEST_RESULT], [ ZFS_AC_KERNEL_DIRTY_INODE ZFS_AC_KERNEL_SHRINKER ZFS_AC_KERNEL_MKDIR - ZFS_AC_KERNEL_LOOKUP_FLAGS ZFS_AC_KERNEL_CREATE ZFS_AC_KERNEL_PERMISSION ZFS_AC_KERNEL_GET_LINK ZFS_AC_KERNEL_PUT_LINK ZFS_AC_KERNEL_TMPFILE - ZFS_AC_KERNEL_AUTOMOUNT ZFS_AC_KERNEL_ENCODE_FH_WITH_INODE - ZFS_AC_KERNEL_COMMIT_METADATA ZFS_AC_KERNEL_CLEAR_INODE ZFS_AC_KERNEL_SETATTR_PREPARE - ZFS_AC_KERNEL_INSERT_INODE_LOCKED ZFS_AC_KERNEL_DENTRY ZFS_AC_KERNEL_DENTRY_ALIAS_D_U - ZFS_AC_KERNEL_TRUNCATE_SETSIZE - ZFS_AC_KERNEL_SECURITY_INODE - ZFS_AC_KERNEL_FST_MOUNT ZFS_AC_KERNEL_BDI - ZFS_AC_KERNEL_SET_NLINK - ZFS_AC_KERNEL_SGET ZFS_AC_KERNEL_LSEEK_EXECUTE ZFS_AC_KERNEL_VFS_FILEMAP_DIRTY_FOLIO ZFS_AC_KERNEL_VFS_READ_FOLIO ZFS_AC_KERNEL_VFS_GETATTR - ZFS_AC_KERNEL_VFS_FSYNC_2ARGS ZFS_AC_KERNEL_VFS_ITERATE ZFS_AC_KERNEL_VFS_DIRECT_IO ZFS_AC_KERNEL_VFS_READPAGES @@ -271,15 +238,10 @@ AC_DEFUN([ZFS_AC_KERNEL_TEST_RESULT], [ ZFS_AC_KERNEL_VFS_CLONE_FILE_RANGE ZFS_AC_KERNEL_VFS_DEDUPE_FILE_RANGE ZFS_AC_KERNEL_VFS_FILE_OPERATIONS_EXTEND - ZFS_AC_KERNEL_KMAP_ATOMIC_ARGS ZFS_AC_KERNEL_KMAP_LOCAL_PAGE - ZFS_AC_KERNEL_FOLLOW_DOWN_ONE ZFS_AC_KERNEL_MAKE_REQUEST_FN ZFS_AC_KERNEL_GENERIC_IO_ACCT ZFS_AC_KERNEL_FPU - ZFS_AC_KERNEL_FMODE_T - ZFS_AC_KERNEL_KUIDGID_T - ZFS_AC_KERNEL_KUID_HELPERS ZFS_AC_KERNEL_RENAME ZFS_AC_KERNEL_CURRENT_TIME ZFS_AC_KERNEL_USERNS_CAPABILITIES