Skip to content
Permalink
Browse files

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 <massimo@mmmm.it>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Richard Yao <ryao@cs.stonybrook.edu>
Closes #884
  • Loading branch information...
maxximino authored and behlendorf committed Aug 23, 2012
1 parent 08b1b21 commit 52cd92022eaf8f105510df708d234012cbe5078d
Showing with 10 additions and 10 deletions.
  1. +2 −2 config/kernel-automount.m4
  2. +8 −8 configure
@@ -9,11 +9,11 @@ AC_DEFUN([ZFS_AC_KERNEL_AUTOMOUNT], [
AC_MSG_CHECKING([whether dops->d_automount() exists])
ZFS_LINUX_TRY_COMPILE([
#include <linux/dcache.h>
],[
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])
@@ -16750,15 +16750,15 @@ cat >>conftest.$ac_ext <<_ACEOF
#include <linux/dcache.h>
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;


#include <linux/dcache.h>
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;

0 comments on commit 52cd920

Please sign in to comment.
You can’t perform that action at this time.