X-Git-Url: https://git.camperquake.de/gitweb.cgi?a=blobdiff_plain;f=configure;h=ded5e332d921bc900b2809ba7ebe0c9d78207cf2;hb=560bcf9d14a63e2cef4dd49d61399c8a865c1348;hp=88155541bfb9cf92c2cf23718bcedf3fd05b21e5;hpb=1d82906dea5eb698a854d992e445e794fb5a0880;p=zfs.git

diff --git a/configure b/configure
index 8815554..ded5e33 100755
--- a/configure
+++ b/configure
@@ -808,6 +808,7 @@ LINUX_SYMBOLS
 LINUX_VERSION
 LINUX_OBJ
 LINUX
+NO_UNUSED_BUT_SET_VARIABLE
 ZFS_CONFIG
 TARGET_ASM_DIR
 DEFAULT_INIT_SCRIPT
@@ -4821,13 +4822,13 @@ if test "${lt_cv_nm_interface+set}" = set; then
 else
   lt_cv_nm_interface="BSD nm"
   echo "int some_variable = 0;" > conftest.$ac_ext
-  (eval echo "\"\$as_me:4824: $ac_compile\"" >&5)
+  (eval echo "\"\$as_me:4825: $ac_compile\"" >&5)
   (eval "$ac_compile" 2>conftest.err)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:4827: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+  (eval echo "\"\$as_me:4828: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:4830: output\"" >&5)
+  (eval echo "\"\$as_me:4831: output\"" >&5)
   cat conftest.out >&5
   if $GREP 'External.*some_variable' conftest.out > /dev/null; then
     lt_cv_nm_interface="MS dumpbin"
@@ -6033,7 +6034,7 @@ ia64-*-hpux*)
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 6036 "configure"' > conftest.$ac_ext
+  echo '#line 6037 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -7886,11 +7887,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7889: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7890: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:7893: \$? = $ac_status" >&5
+   echo "$as_me:7894: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -8225,11 +8226,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:8228: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8229: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:8232: \$? = $ac_status" >&5
+   echo "$as_me:8233: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -8330,11 +8331,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:8333: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8334: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:8337: \$? = $ac_status" >&5
+   echo "$as_me:8338: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -8385,11 +8386,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:8388: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8389: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:8392: \$? = $ac_status" >&5
+   echo "$as_me:8393: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -11188,7 +11189,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 11191 "configure"
+#line 11192 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11284,7 +11285,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 11287 "configure"
+#line 11288 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11785,16 +11786,18 @@ $as_echo_n "checking linux distribution... " >&6; }
 		VENDOR=redhat ;
 	elif test -f /etc/fedora-release ; then
 		VENDOR=fedora ;
-	elif test -f /etc/lsb-release ; then
-		VENDOR=ubuntu ;
+	elif test -f /etc/gentoo-release ; then
+		VENDOR=gentoo ;
 	elif test -f /etc/debian_version ; then
 		VENDOR=debian ;
 	elif test -f /etc/SuSE-release ; then
 		VENDOR=sles ;
 	elif test -f /etc/slackware-version ; then
 		VENDOR=slackware ;
-	elif test -f /etc/gentoo-release ; then
-		VENDOR=gentoo ;
+	elif test -f /etc/lsb-release ; then
+		VENDOR=ubuntu ;
+	elif test -f /etc/lunar.release ; then
+		VENDOR=lunar ;
 	else
 		VENDOR= ;
 	fi
@@ -11805,12 +11808,14 @@ $as_echo "$VENDOR" >&6; }
 	{ $as_echo "$as_me:$LINENO: checking default package type" >&5
 $as_echo_n "checking default package type... " >&6; }
 	case "$VENDOR" in
-		fedora)     DEFAULT_PACKAGE=rpm ;;
 		redhat)     DEFAULT_PACKAGE=rpm ;;
-		sles)       DEFAULT_PACKAGE=rpm ;;
+		fedora)     DEFAULT_PACKAGE=rpm ;;
 		ubuntu)     DEFAULT_PACKAGE=deb ;;
 		debian)     DEFAULT_PACKAGE=deb ;;
+		sles)       DEFAULT_PACKAGE=rpm ;;
 		slackware)  DEFAULT_PACKAGE=tgz ;;
+		gentoo)     DEFAULT_PACKAGE=tgz ;;
+		lunar)      DEFAULT_PACKAGE=tgz ;;
 		*)          DEFAULT_PACKAGE=rpm ;;
 	esac
 
@@ -11821,12 +11826,14 @@ $as_echo "$DEFAULT_PACKAGE" >&6; }
 	{ $as_echo "$as_me:$LINENO: checking default init script type" >&5
 $as_echo_n "checking default init script type... " >&6; }
 	case "$VENDOR" in
+		redhat)     DEFAULT_INIT_SCRIPT=redhat ;;
 		fedora)     DEFAULT_INIT_SCRIPT=fedora ;;
-		redhat)     DEFAULT_INIT_SCRIPT=fedora ;;
-		sles)       DEFAULT_INIT_SCRIPT=lsb ;;
 		ubuntu)     DEFAULT_INIT_SCRIPT=lsb ;;
 		debian)     DEFAULT_INIT_SCRIPT=lsb ;;
+		sles)       DEFAULT_INIT_SCRIPT=lsb ;;
 		slackware)  DEFAULT_INIT_SCRIPT=lsb ;;
+		gentoo)     DEFAULT_INIT_SCRIPT=gentoo ;;
+		lunar)      DEFAULT_INIT_SCRIPT=lunar ;;
 		*)          DEFAULT_INIT_SCRIPT=lsb ;;
 	esac
 
@@ -11853,6 +11860,88 @@ $as_echo_n "checking zfs config... " >&6; }
 $as_echo "$ZFS_CONFIG" >&6; };
 
 
+
+
+	{ $as_echo "$as_me:$LINENO: checking for -Wno-unused-but-set-variable support" >&5
+$as_echo_n "checking for -Wno-unused-but-set-variable support... " >&6; }
+
+	saved_flags="$CFLAGS"
+	CFLAGS="$CFLAGS -Wunused-but-set-variable"
+
+	if test "$cross_compiling" = yes; then
+  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+See \`config.log' for more details." >&5
+$as_echo "$as_me: error: cannot run test program while cross compiling
+See \`config.log' for more details." >&2;}
+   { (exit 1); exit 1; }; }; }
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+
+		NO_UNUSED_BUT_SET_VARIABLE=-Wno-unused-but-set-variable
+		{ $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
+
+else
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+( exit $ac_status )
+
+		NO_UNUSED_BUT_SET_VARIABLE=
+		{ $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+
+fi
+rm -rf conftest.dSYM
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+fi
+
+
+
+	CFLAGS="$saved_flags"
+
+
+
+
 	case "$ZFS_CONFIG" in
 		kernel)
 
@@ -12372,7 +12461,7 @@ int
 main (void)
 {
 
-		fmode_t *ptr;
+		fmode_t *ptr __attribute__ ((unused));
 
   ;
   return 0;
@@ -12437,7 +12526,7 @@ int
 main (void)
 {
 
-		int val;
+		int val __attribute__ ((unused));
 		val = KOBJ_NAME_LEN;
 
   ;
@@ -12583,7 +12672,7 @@ int
 main (void)
 {
 
-		struct block_device *bdev;
+		struct block_device *bdev = NULL;
 		invalidate_bdev(bdev);
 
   ;
@@ -12782,7 +12871,7 @@ int
 main (void)
 {
 
-		int flags;
+		int flags __attribute__ ((unused));
 		flags = (1 << BIO_RW_FAILFAST);
 
   ;
@@ -12848,7 +12937,7 @@ int
 main (void)
 {
 
-		int flags;
+		int flags __attribute__ ((unused));
 		flags = ((1 << BIO_RW_FAILFAST_DEV) |
 			 (1 << BIO_RW_FAILFAST_TRANSPORT) |
 			 (1 << BIO_RW_FAILFAST_DRIVER));
@@ -12916,7 +13005,7 @@ int
 main (void)
 {
 
-		int flags;
+		int flags __attribute__ ((unused));
 		flags = REQ_FAILFAST_MASK;
 
   ;
@@ -12985,7 +13074,7 @@ main (void)
 {
 
 		void (*wanted_end_io)(struct bio *, int) = NULL;
-		bio_end_io_t *local_end_io;
+		bio_end_io_t *local_end_io __attribute__ ((unused));
 
 		local_end_io = wanted_end_io;
 
@@ -13053,7 +13142,7 @@ int
 main (void)
 {
 
-		int flags;
+		int flags __attribute__ ((unused));
 		flags = BIO_RW_SYNC;
 
   ;
@@ -13119,7 +13208,7 @@ int
 main (void)
 {
 
-		int flags;
+		int flags __attribute__ ((unused));
 		flags = BIO_RW_SYNCIO;
 
   ;
@@ -13185,7 +13274,7 @@ int
 main (void)
 {
 
-		int flags;
+		int flags __attribute__ ((unused));
 		flags = REQ_SYNC;
 
   ;
@@ -13994,7 +14083,7 @@ int
 main (void)
 {
 
-		struct super_block sb;
+		struct super_block sb __attribute__ ((unused));
 
 		sb.s_xattr = xattr_handlers;
 
@@ -14063,7 +14152,7 @@ main (void)
 
 		int (*get)(struct dentry *dentry, const char *name,
 		    void *buffer, size_t size, int handler_flags) = NULL;
-		struct xattr_handler xops;
+		struct xattr_handler xops __attribute__ ((unused));
 
 		xops.get = get;
 
@@ -14133,7 +14222,7 @@ main (void)
 		int (*set)(struct dentry *dentry, const char *name,
 		    const void *buffer, size_t size, int flags,
 		    int handler_flags) = NULL;
-		struct xattr_handler xops;
+		struct xattr_handler xops __attribute__ ((unused));
 
 		xops.set = set;
 
@@ -14201,7 +14290,7 @@ main (void)
 {
 
 		int (*fsync) (struct file *, int datasync) = NULL;
-		struct file_operations fops;
+		struct file_operations fops __attribute__ ((unused));
 
 		fops.fsync = fsync;
 
@@ -14269,7 +14358,7 @@ main (void)
 {
 
 		void (*evict_inode) (struct inode *) = NULL;
-		struct super_operations sops;
+		struct super_operations sops __attribute__ ((unused));
 
 		sops.evict_inode = evict_inode;
 
@@ -14358,13 +14447,94 @@ _ACEOF
 
 
 
+	{ $as_echo "$as_me:$LINENO: checking whether symbol d_obtain_alias is exported" >&5
+$as_echo_n "checking whether symbol d_obtain_alias is exported... " >&6; }
+	grep -q -E '[[:space:]]d_obtain_alias[[:space:]]' \
+		$LINUX_OBJ/$LINUX_SYMBOLS 2>/dev/null
+	rc=$?
+	if test $rc -ne 0; then
+		export=0
+		for file in fs/dcache.c; do
+			grep -q -E "EXPORT_SYMBOL.*(d_obtain_alias)" "$LINUX/$file" 2>/dev/null
+			rc=$?
+		        if test $rc -eq 0; then
+		                export=1
+		                break;
+		        fi
+		done
+		if test $export -eq 0; then
+			{ $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+
+		else
+			{ $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_D_OBTAIN_ALIAS 1
+_ACEOF
+
+		fi
+	else
+		{ $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_D_OBTAIN_ALIAS 1
+_ACEOF
+
+	fi
+
+
+
+	{ $as_echo "$as_me:$LINENO: checking whether symbol check_disk_size_change is exported" >&5
+$as_echo_n "checking whether symbol check_disk_size_change is exported... " >&6; }
+	grep -q -E '[[:space:]]check_disk_size_change[[:space:]]' \
+		$LINUX_OBJ/$LINUX_SYMBOLS 2>/dev/null
+	rc=$?
+	if test $rc -ne 0; then
+		export=0
+		for file in fs/block_dev.c; do
+			grep -q -E "EXPORT_SYMBOL.*(check_disk_size_change)" "$LINUX/$file" 2>/dev/null
+			rc=$?
+		        if test $rc -eq 0; then
+		                export=1
+		                break;
+		        fi
+		done
+		if test $export -eq 0; then
+			{ $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+
+		else
+			{ $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_CHECK_DISK_SIZE_CHANGE 1
+_ACEOF
+
+		fi
+	else
+		{ $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_CHECK_DISK_SIZE_CHANGE 1
+_ACEOF
+
+	fi
+
+
+
 	if test "$LINUX_OBJ" != "$LINUX"; then
 		KERNELMAKE_PARAMS="$KERNELMAKE_PARAMS O=$LINUX_OBJ"
 	fi
 
 
 
-			KERNELCPPFLAGS="$KERNELCPPFLAGS -DHAVE_SPL -D_KERNEL"
+			KERNELCPPFLAGS="$KERNELCPPFLAGS $NO_UNUSED_BUT_SET_VARIABLE"
+	KERNELCPPFLAGS="$KERNELCPPFLAGS -DHAVE_SPL -D_KERNEL"
 	KERNELCPPFLAGS="$KERNELCPPFLAGS -DTEXT_DOMAIN=\\\"zfs-linux-kernel\\\""
 
 
@@ -16417,7 +16587,7 @@ int
 main (void)
 {
 
-		fmode_t *ptr;
+		fmode_t *ptr __attribute__ ((unused));
 
   ;
   return 0;
@@ -16482,7 +16652,7 @@ int
 main (void)
 {
 
-		int val;
+		int val __attribute__ ((unused));
 		val = KOBJ_NAME_LEN;
 
   ;
@@ -16628,7 +16798,7 @@ int
 main (void)
 {
 
-		struct block_device *bdev;
+		struct block_device *bdev = NULL;
 		invalidate_bdev(bdev);
 
   ;
@@ -16827,7 +16997,7 @@ int
 main (void)
 {
 
-		int flags;
+		int flags __attribute__ ((unused));
 		flags = (1 << BIO_RW_FAILFAST);
 
   ;
@@ -16893,7 +17063,7 @@ int
 main (void)
 {
 
-		int flags;
+		int flags __attribute__ ((unused));
 		flags = ((1 << BIO_RW_FAILFAST_DEV) |
 			 (1 << BIO_RW_FAILFAST_TRANSPORT) |
 			 (1 << BIO_RW_FAILFAST_DRIVER));
@@ -16961,7 +17131,7 @@ int
 main (void)
 {
 
-		int flags;
+		int flags __attribute__ ((unused));
 		flags = REQ_FAILFAST_MASK;
 
   ;
@@ -17030,7 +17200,7 @@ main (void)
 {
 
 		void (*wanted_end_io)(struct bio *, int) = NULL;
-		bio_end_io_t *local_end_io;
+		bio_end_io_t *local_end_io __attribute__ ((unused));
 
 		local_end_io = wanted_end_io;
 
@@ -17098,7 +17268,7 @@ int
 main (void)
 {
 
-		int flags;
+		int flags __attribute__ ((unused));
 		flags = BIO_RW_SYNC;
 
   ;
@@ -17164,7 +17334,7 @@ int
 main (void)
 {
 
-		int flags;
+		int flags __attribute__ ((unused));
 		flags = BIO_RW_SYNCIO;
 
   ;
@@ -17230,7 +17400,7 @@ int
 main (void)
 {
 
-		int flags;
+		int flags __attribute__ ((unused));
 		flags = REQ_SYNC;
 
   ;
@@ -18039,7 +18209,7 @@ int
 main (void)
 {
 
-		struct super_block sb;
+		struct super_block sb __attribute__ ((unused));
 
 		sb.s_xattr = xattr_handlers;
 
@@ -18108,7 +18278,7 @@ main (void)
 
 		int (*get)(struct dentry *dentry, const char *name,
 		    void *buffer, size_t size, int handler_flags) = NULL;
-		struct xattr_handler xops;
+		struct xattr_handler xops __attribute__ ((unused));
 
 		xops.get = get;
 
@@ -18178,7 +18348,7 @@ main (void)
 		int (*set)(struct dentry *dentry, const char *name,
 		    const void *buffer, size_t size, int flags,
 		    int handler_flags) = NULL;
-		struct xattr_handler xops;
+		struct xattr_handler xops __attribute__ ((unused));
 
 		xops.set = set;
 
@@ -18246,7 +18416,7 @@ main (void)
 {
 
 		int (*fsync) (struct file *, int datasync) = NULL;
-		struct file_operations fops;
+		struct file_operations fops __attribute__ ((unused));
 
 		fops.fsync = fsync;
 
@@ -18314,7 +18484,7 @@ main (void)
 {
 
 		void (*evict_inode) (struct inode *) = NULL;
-		struct super_operations sops;
+		struct super_operations sops __attribute__ ((unused));
 
 		sops.evict_inode = evict_inode;
 
@@ -18403,13 +18573,94 @@ _ACEOF
 
 
 
+	{ $as_echo "$as_me:$LINENO: checking whether symbol d_obtain_alias is exported" >&5
+$as_echo_n "checking whether symbol d_obtain_alias is exported... " >&6; }
+	grep -q -E '[[:space:]]d_obtain_alias[[:space:]]' \
+		$LINUX_OBJ/$LINUX_SYMBOLS 2>/dev/null
+	rc=$?
+	if test $rc -ne 0; then
+		export=0
+		for file in fs/dcache.c; do
+			grep -q -E "EXPORT_SYMBOL.*(d_obtain_alias)" "$LINUX/$file" 2>/dev/null
+			rc=$?
+		        if test $rc -eq 0; then
+		                export=1
+		                break;
+		        fi
+		done
+		if test $export -eq 0; then
+			{ $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+
+		else
+			{ $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_D_OBTAIN_ALIAS 1
+_ACEOF
+
+		fi
+	else
+		{ $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_D_OBTAIN_ALIAS 1
+_ACEOF
+
+	fi
+
+
+
+	{ $as_echo "$as_me:$LINENO: checking whether symbol check_disk_size_change is exported" >&5
+$as_echo_n "checking whether symbol check_disk_size_change is exported... " >&6; }
+	grep -q -E '[[:space:]]check_disk_size_change[[:space:]]' \
+		$LINUX_OBJ/$LINUX_SYMBOLS 2>/dev/null
+	rc=$?
+	if test $rc -ne 0; then
+		export=0
+		for file in fs/block_dev.c; do
+			grep -q -E "EXPORT_SYMBOL.*(check_disk_size_change)" "$LINUX/$file" 2>/dev/null
+			rc=$?
+		        if test $rc -eq 0; then
+		                export=1
+		                break;
+		        fi
+		done
+		if test $export -eq 0; then
+			{ $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+
+		else
+			{ $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_CHECK_DISK_SIZE_CHANGE 1
+_ACEOF
+
+		fi
+	else
+		{ $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_CHECK_DISK_SIZE_CHANGE 1
+_ACEOF
+
+	fi
+
+
+
 	if test "$LINUX_OBJ" != "$LINUX"; then
 		KERNELMAKE_PARAMS="$KERNELMAKE_PARAMS O=$LINUX_OBJ"
 	fi
 
 
 
-			KERNELCPPFLAGS="$KERNELCPPFLAGS -DHAVE_SPL -D_KERNEL"
+			KERNELCPPFLAGS="$KERNELCPPFLAGS $NO_UNUSED_BUT_SET_VARIABLE"
+	KERNELCPPFLAGS="$KERNELCPPFLAGS -DHAVE_SPL -D_KERNEL"
 	KERNELCPPFLAGS="$KERNELCPPFLAGS -DTEXT_DOMAIN=\\\"zfs-linux-kernel\\\""
 
 
@@ -20008,7 +20259,7 @@ fi
 $as_echo "$enable_debug" >&6; }
 
 
-ac_config_files="$ac_config_files Makefile dracut/Makefile dracut/90zfs/Makefile etc/Makefile etc/udev/Makefile etc/udev/rules.d/Makefile etc/udev/rules.d/60-zpool.rules etc/udev/rules.d/60-zvol.rules etc/init.d/Makefile etc/zfs/Makefile man/Makefile man/man8/Makefile lib/Makefile lib/libspl/Makefile lib/libspl/asm-generic/Makefile lib/libspl/asm-i386/Makefile lib/libspl/asm-x86_64/Makefile lib/libspl/include/Makefile lib/libspl/include/ia32/Makefile lib/libspl/include/ia32/sys/Makefile lib/libspl/include/rpc/Makefile lib/libspl/include/sys/Makefile lib/libspl/include/sys/sysevent/Makefile lib/libspl/include/sys/dktp/Makefile lib/libspl/include/util/Makefile lib/libavl/Makefile lib/libefi/Makefile lib/libnvpair/Makefile lib/libunicode/Makefile lib/libuutil/Makefile lib/libzpool/Makefile lib/libzfs/Makefile cmd/Makefile cmd/zdb/Makefile cmd/zfs/Makefile cmd/zinject/Makefile cmd/zpool/Makefile cmd/ztest/Makefile cmd/zpios/Makefile cmd/mount_zfs/Makefile cmd/zpool_layout/Makefile cmd/zvol_id/Makefile cmd/zpool_id/Makefile module/Makefile module/avl/Makefile module/nvpair/Makefile module/unicode/Makefile module/zcommon/Makefile module/zfs/Makefile module/zpios/Makefile include/Makefile include/linux/Makefile include/sys/Makefile include/sys/fs/Makefile include/sys/fm/Makefile include/sys/fm/fs/Makefile scripts/Makefile scripts/zpios-profile/Makefile scripts/zpios-test/Makefile scripts/zpool-config/Makefile scripts/zpool-layout/Makefile scripts/common.sh zfs.spec zfs-modules.spec zfs-script-config.sh"
+ac_config_files="$ac_config_files Makefile dracut/Makefile dracut/90zfs/Makefile etc/Makefile etc/udev/Makefile etc/udev/rules.d/Makefile etc/init.d/Makefile etc/zfs/Makefile man/Makefile man/man8/Makefile lib/Makefile lib/libspl/Makefile lib/libspl/asm-generic/Makefile lib/libspl/asm-i386/Makefile lib/libspl/asm-x86_64/Makefile lib/libspl/include/Makefile lib/libspl/include/ia32/Makefile lib/libspl/include/ia32/sys/Makefile lib/libspl/include/rpc/Makefile lib/libspl/include/sys/Makefile lib/libspl/include/sys/sysevent/Makefile lib/libspl/include/sys/dktp/Makefile lib/libspl/include/util/Makefile lib/libavl/Makefile lib/libefi/Makefile lib/libnvpair/Makefile lib/libunicode/Makefile lib/libuutil/Makefile lib/libzpool/Makefile lib/libzfs/Makefile cmd/Makefile cmd/zdb/Makefile cmd/zfs/Makefile cmd/zinject/Makefile cmd/zpool/Makefile cmd/ztest/Makefile cmd/zpios/Makefile cmd/mount_zfs/Makefile cmd/zpool_layout/Makefile cmd/zvol_id/Makefile cmd/zpool_id/Makefile cmd/sas_switch_id/Makefile module/Makefile module/avl/Makefile module/nvpair/Makefile module/unicode/Makefile module/zcommon/Makefile module/zfs/Makefile module/zpios/Makefile include/Makefile include/linux/Makefile include/sys/Makefile include/sys/fs/Makefile include/sys/fm/Makefile include/sys/fm/fs/Makefile scripts/Makefile scripts/zpios-profile/Makefile scripts/zpios-test/Makefile scripts/zpool-config/Makefile scripts/zpool-layout/Makefile scripts/common.sh zfs.spec zfs-modules.spec zfs-script-config.sh"
 
 
 cat >confcache <<\_ACEOF
@@ -20930,8 +21181,6 @@ do
     "etc/Makefile") CONFIG_FILES="$CONFIG_FILES etc/Makefile" ;;
     "etc/udev/Makefile") CONFIG_FILES="$CONFIG_FILES etc/udev/Makefile" ;;
     "etc/udev/rules.d/Makefile") CONFIG_FILES="$CONFIG_FILES etc/udev/rules.d/Makefile" ;;
-    "etc/udev/rules.d/60-zpool.rules") CONFIG_FILES="$CONFIG_FILES etc/udev/rules.d/60-zpool.rules" ;;
-    "etc/udev/rules.d/60-zvol.rules") CONFIG_FILES="$CONFIG_FILES etc/udev/rules.d/60-zvol.rules" ;;
     "etc/init.d/Makefile") CONFIG_FILES="$CONFIG_FILES etc/init.d/Makefile" ;;
     "etc/zfs/Makefile") CONFIG_FILES="$CONFIG_FILES etc/zfs/Makefile" ;;
     "man/Makefile") CONFIG_FILES="$CONFIG_FILES man/Makefile" ;;
@@ -20967,6 +21216,7 @@ do
     "cmd/zpool_layout/Makefile") CONFIG_FILES="$CONFIG_FILES cmd/zpool_layout/Makefile" ;;
     "cmd/zvol_id/Makefile") CONFIG_FILES="$CONFIG_FILES cmd/zvol_id/Makefile" ;;
     "cmd/zpool_id/Makefile") CONFIG_FILES="$CONFIG_FILES cmd/zpool_id/Makefile" ;;
+    "cmd/sas_switch_id/Makefile") CONFIG_FILES="$CONFIG_FILES cmd/sas_switch_id/Makefile" ;;
     "module/Makefile") CONFIG_FILES="$CONFIG_FILES module/Makefile" ;;
     "module/avl/Makefile") CONFIG_FILES="$CONFIG_FILES module/avl/Makefile" ;;
     "module/nvpair/Makefile") CONFIG_FILES="$CONFIG_FILES module/nvpair/Makefile" ;;