diff options
| -rw-r--r-- | config/kernel-show-options.m4 | 9 | ||||
| -rwxr-xr-x | configure | 18 |
2 files changed, 15 insertions, 12 deletions
diff --git a/config/kernel-show-options.m4 b/config/kernel-show-options.m4 index 1bddb0a7a..67d683c55 100644 --- a/config/kernel-show-options.m4 +++ b/config/kernel-show-options.m4 @@ -6,11 +6,12 @@ AC_DEFUN([ZFS_AC_KERNEL_SHOW_OPTIONS], [ ZFS_LINUX_TRY_COMPILE([ #include <linux/fs.h> - ],[ - int (*show_options) (struct seq_file *, struct dentry *) = NULL; - struct super_operations sops __attribute__ ((unused)); - sops.show_options = show_options; + int show_options (struct seq_file * x, struct dentry * y) { return 0; }; + static struct super_operations sops __attribute__ ((unused)) = { + .show_options = show_options, + }; + ],[ ],[ AC_MSG_RESULT([yes]) AC_DEFINE(HAVE_SHOW_OPTIONS_WITH_DENTRY, 1, @@ -15280,14 +15280,15 @@ cat >>conftest.$ac_ext <<_ACEOF #include <linux/fs.h> + int show_options (struct seq_file * x, struct dentry * y) { return 0; }; + static struct super_operations sops __attribute__ ((unused)) = { + .show_options = show_options, + }; + int main (void) { - int (*show_options) (struct seq_file *, struct dentry *) = NULL; - struct super_operations sops __attribute__ ((unused)); - - sops.show_options = show_options; ; return 0; @@ -21807,14 +21808,15 @@ cat >>conftest.$ac_ext <<_ACEOF #include <linux/fs.h> + int show_options (struct seq_file * x, struct dentry * y) { return 0; }; + static struct super_operations sops __attribute__ ((unused)) = { + .show_options = show_options, + }; + int main (void) { - int (*show_options) (struct seq_file *, struct dentry *) = NULL; - struct super_operations sops __attribute__ ((unused)); - - sops.show_options = show_options; ; return 0; |