From 52cd92022eaf8f105510df708d234012cbe5078d Mon Sep 17 00:00:00 2001 From: Massimo Maggi Date: Thu, 23 Aug 2012 14:52:45 +0200 Subject: [PATCH] Fix snapshot automounting with GrSecurity constify plugin. ./configure erroneously detects absence of dops->d_automount when built against a GrSecurity patched kernel. Summerized error message found in config.log: checking whether dops->d_automount() exists ... In function 'main': ... error: constified variable 'dops' cannot be local The "dops" variable cannot be a local variable, so it's moved to the global scope. This test also fails if the prototype of the dops->d_automount function pointer is changed. Signed-off-by: Massimo Maggi Signed-off-by: Brian Behlendorf Signed-off-by: Richard Yao Closes #884 --- config/kernel-automount.m4 | 4 ++-- configure | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/config/kernel-automount.m4 b/config/kernel-automount.m4 index 972b09b..1ee4c16 100644 --- a/config/kernel-automount.m4 +++ b/config/kernel-automount.m4 @@ -9,12 +9,12 @@ AC_DEFUN([ZFS_AC_KERNEL_AUTOMOUNT], [ AC_MSG_CHECKING([whether dops->d_automount() exists]) ZFS_LINUX_TRY_COMPILE([ #include - ],[ - struct vfsmount *(*d_automount) (struct path *) = NULL; + struct vfsmount *d_automount(struct path *p) { return NULL; } struct dentry_operations dops __attribute__ ((unused)) = { .d_automount = d_automount, }; ],[ + ],[ AC_MSG_RESULT(yes) AC_DEFINE(HAVE_AUTOMOUNT, 1, [dops->automount() exists]) ],[ diff --git a/configure b/configure index 23c90c2..83fc2a8 100755 --- a/configure +++ b/configure @@ -16750,15 +16750,15 @@ cat >>conftest.$ac_ext <<_ACEOF #include + struct vfsmount *d_automount(struct path *p) { return NULL; } + struct dentry_operations dops __attribute__ ((unused)) = { + .d_automount = d_automount, + }; int main (void) { - struct vfsmount *(*d_automount) (struct path *) = NULL; - struct dentry_operations dops __attribute__ ((unused)) = { - .d_automount = d_automount, - }; ; return 0; @@ -24359,15 +24359,15 @@ cat >>conftest.$ac_ext <<_ACEOF #include + struct vfsmount *d_automount(struct path *p) { return NULL; } + struct dentry_operations dops __attribute__ ((unused)) = { + .d_automount = d_automount, + }; int main (void) { - struct vfsmount *(*d_automount) (struct path *) = NULL; - struct dentry_operations dops __attribute__ ((unused)) = { - .d_automount = d_automount, - }; ; return 0; -- 1.8.3.1