UBUNTU: SAUCE: (noup) Update spl to 0.6.5.11-1, zfs to 0.6.5.11-1ubuntu1

Signed-off-by: Colin Ian King <colin.king@canonical.com>
Signed-off-by: Seth Forshee <seth.forshee@canonical.com>

spl/META

@@ -1,7 +1,7 @@
 Meta:         1
 Name:         spl
 Branch:       1.0
-Version:      0.6.5.10
+Version:      0.6.5.11
 Release:      1
 Release-Tags: relext
 License:      GPL

spl/config/spl-build.m4

@@ -1311,7 +1311,8 @@ AC_DEFUN([SPL_AC_RWSEM_SPINLOCK_IS_RAW], [
 		#include <linux/rwsem.h>
 	],[
 		struct rw_semaphore dummy_semaphore __attribute__ ((unused));
-		raw_spinlock_t dummy_lock __attribute__ ((unused));
+		raw_spinlock_t dummy_lock __attribute__ ((unused)) =
+		    __RAW_SPIN_LOCK_INITIALIZER(dummy_lock);
 		dummy_semaphore.wait_lock = dummy_lock;
 	],[
 		AC_MSG_RESULT(yes)

spl/configure

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for spl 0.6.5.10.
+# Generated by GNU Autoconf 2.69 for spl 0.6.5.11.
 #
 #
 # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -587,8 +587,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='spl'
 PACKAGE_TARNAME='spl'
-PACKAGE_VERSION='0.6.5.10'
-PACKAGE_STRING='spl 0.6.5.10'
+PACKAGE_VERSION='0.6.5.11'
+PACKAGE_STRING='spl 0.6.5.11'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -1389,7 +1389,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures spl 0.6.5.10 to adapt to many kinds of systems.
+\`configure' configures spl 0.6.5.11 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1461,7 +1461,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of spl 0.6.5.10:";;
+     short | recursive ) echo "Configuration of spl 0.6.5.11:";;
    esac
   cat <<\_ACEOF
 
@@ -1586,7 +1586,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-spl configure 0.6.5.10
+spl configure 0.6.5.11
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1864,7 +1864,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by spl $as_me 0.6.5.10, which was
+It was created by spl $as_me 0.6.5.11, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2997,7 +2997,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='spl'
- VERSION='0.6.5.10'
+ VERSION='0.6.5.11'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -14463,7 +14463,8 @@ main (void)
 {
 
 		struct rw_semaphore dummy_semaphore __attribute__ ((unused));
-		raw_spinlock_t dummy_lock __attribute__ ((unused));
+		raw_spinlock_t dummy_lock __attribute__ ((unused)) =
+		    __RAW_SPIN_LOCK_INITIALIZER(dummy_lock);
 		dummy_semaphore.wait_lock = dummy_lock;
 
   ;
@@ -17447,7 +17448,8 @@ main (void)
 {
 
 		struct rw_semaphore dummy_semaphore __attribute__ ((unused));
-		raw_spinlock_t dummy_lock __attribute__ ((unused));
+		raw_spinlock_t dummy_lock __attribute__ ((unused)) =
+		    __RAW_SPIN_LOCK_INITIALIZER(dummy_lock);
 		dummy_semaphore.wait_lock = dummy_lock;
 
   ;
@@ -18924,7 +18926,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by spl $as_me 0.6.5.10, which was
+This file was extended by spl $as_me 0.6.5.11, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -18990,7 +18992,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-spl config.status 0.6.5.10
+spl config.status 0.6.5.11
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 

spl/dkms.conf

@@ -1,6 +1,6 @@
 AUTOINSTALL="yes"
 PACKAGE_NAME="spl"
-PACKAGE_VERSION="0.6.5.10"
+PACKAGE_VERSION="0.6.5.11"
 PRE_BUILD="configure
   --prefix=/usr
   --with-config=kernel

spl/rpm/generic/spl-kmod.spec.in

@@ -167,6 +167,8 @@ chmod u+x ${RPM_BUILD_ROOT}%{kmodinstdir_prefix}/*/extra/*/*/*
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Mon Jul 10 2017 Tony Hutter <hutter2@llnl.gov> - 0.6.5.11-1
+- Fix RWSEM_SPINLOCK_IS_RAW check failed  zfsonlinux/zfs#622
 * Mon Jun 12 2017 Tony Hutter <hutter2@llnl.gov> - 0.6.5.10-1
 - Linux 4.12 compat: PF_FSTRANS was removed zfsonlinux/spl#614
 - Clear PF_FSTRANS over spl_filp_fallocate() zfsonlinux/splzfsonlinux/zfs#4529

spl/rpm/generic/spl.spec.in

@@ -33,6 +33,8 @@ make install DESTDIR=%{?buildroot}
 %{_mandir}/man5/*
 
 %changelog
+* Mon Jul 10 2017 Tony Hutter <hutter2@llnl.gov> - 0.6.5.11-1
+- Fix RWSEM_SPINLOCK_IS_RAW check failed  zfsonlinux/zfs#622
 * Mon Jun 12 2017 Tony Hutter <hutter2@llnl.gov> - 0.6.5.10-1
 - Linux 4.12 compat: PF_FSTRANS was removed zfsonlinux/spl#614
 - Clear PF_FSTRANS over spl_filp_fallocate() zfsonlinux/splzfsonlinux/zfs#4529

spl/rpm/redhat/spl.spec.in

@@ -33,6 +33,8 @@ make install DESTDIR=%{?buildroot}
 %{_mandir}/man5/*
 
 %changelog
+* Mon Jul 10 2017 Tony Hutter <hutter2@llnl.gov> - 0.6.5.11-1
+- Fix RWSEM_SPINLOCK_IS_RAW check failed  zfsonlinux/zfs#622
 * Mon Jun 12 2017 Tony Hutter <hutter2@llnl.gov> - 0.6.5.10-1
 - Linux 4.12 compat: PF_FSTRANS was removed zfsonlinux/spl#614
 - Clear PF_FSTRANS over spl_filp_fallocate() zfsonlinux/splzfsonlinux/zfs#4529

zfs/META

@@ -1,8 +1,8 @@
 Meta:         1
 Name:         zfs
 Branch:       1.0
-Version:      0.6.5.10
-Release:      1ubuntu2~2
+Version:      0.6.5.11
+Release:      1ubuntu1
 Release-Tags: relext
 License:      CDDL
 Author:       OpenZFS on Linux

zfs/Makefile.in

@@ -186,6 +186,8 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-no-bool-compare.m4 \
 	$(top_srcdir)/config/user-frame-larger-than.m4 \
 	$(top_srcdir)/config/user-libblkid.m4 \
 	$(top_srcdir)/config/user-libuuid.m4 \
+	$(top_srcdir)/config/user-makedev.m4 \
+	$(top_srcdir)/config/user-no-format-truncation.m4 \
 	$(top_srcdir)/config/user-runstatedir.m4 \
 	$(top_srcdir)/config/user-systemd.m4 \
 	$(top_srcdir)/config/user-sysvinit.m4 \
@@ -430,6 +432,7 @@ MKDIR_P = @MKDIR_P@
 NM = @NM@
 NMEDIT = @NMEDIT@
 NO_BOOL_COMPARE = @NO_BOOL_COMPARE@
+NO_FORMAT_TRUNCATION = @NO_FORMAT_TRUNCATION@
 NO_UNUSED_BUT_SET_VARIABLE = @NO_UNUSED_BUT_SET_VARIABLE@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@

zfs/aclocal.m4

@@ -1294,6 +1294,8 @@ m4_include([config/user-dracut.m4])
 m4_include([config/user-frame-larger-than.m4])
 m4_include([config/user-libblkid.m4])
 m4_include([config/user-libuuid.m4])
+m4_include([config/user-makedev.m4])
+m4_include([config/user-no-format-truncation.m4])
 m4_include([config/user-runstatedir.m4])
 m4_include([config/user-systemd.m4])
 m4_include([config/user-sysvinit.m4])

zfs/config/kernel-bio-op.m4

@@ -69,7 +69,7 @@ AC_DEFUN([ZFS_AC_KERNEL_BIO_BI_OPF], [
 AC_DEFUN([ZFS_AC_KERNEL_HAVE_BIO_SET_OP_ATTRS], [
 	AC_MSG_CHECKING([whether bio_set_op_attrs is available])
 	ZFS_LINUX_TRY_COMPILE([
-		#include <linux/blk_types.h>
+		#include <linux/bio.h>
 	],[
 		struct bio *bio __attribute__ ((unused)) = NULL;
 

zfs/config/user-makedev.m4

@@ -0,0 +1,39 @@
+dnl #
+dnl # glibc 2.25
+dnl #
+AC_DEFUN([ZFS_AC_CONFIG_USER_MAKEDEV_IN_SYSMACROS], [
+	AC_MSG_CHECKING([makedev() is declared in sys/sysmacros.h])
+	AC_TRY_COMPILE(
+	[
+		#include <sys/sysmacros.h>
+	],[
+		int k;
+		k = makedev(0,0);
+	],[
+		AC_MSG_RESULT(yes)
+		AC_DEFINE(HAVE_MAKEDEV_IN_SYSMACROS, 1,
+		    [makedev() is declared in sys/sysmacros.h])
+	],[
+		AC_MSG_RESULT(no)
+	])
+])
+
+dnl #
+dnl # glibc X < Y < 2.25
+dnl #
+AC_DEFUN([ZFS_AC_CONFIG_USER_MAKEDEV_IN_MKDEV], [
+	AC_MSG_CHECKING([makedev() is declared in sys/mkdev.h])
+	AC_TRY_COMPILE(
+	[
+		#include <sys/mkdev.h>
+	],[
+		int k;
+		k = makedev(0,0);
+	],[
+		AC_MSG_RESULT(yes)
+		AC_DEFINE(HAVE_MAKEDEV_IN_MKDEV, 1,
+		    [makedev() is declared in sys/mkdev.h])
+	],[
+		AC_MSG_RESULT(no)
+	])
+])

zfs/config/user-no-format-truncation.m4

@@ -0,0 +1,22 @@
+dnl #
+dnl # Check if gcc supports -Wno-format-truncation option.
+dnl #
+AC_DEFUN([ZFS_AC_CONFIG_USER_NO_FORMAT_TRUNCATION], [
+	AC_MSG_CHECKING([for -Wno-format-truncation support])
+
+	saved_flags="$CFLAGS"
+	CFLAGS="$CFLAGS -Wno-format-truncation"
+
+	AC_COMPILE_IFELSE([AC_LANG_PROGRAM([], [])],
+	[
+		NO_FORMAT_TRUNCATION=-Wno-format-truncation
+		AC_MSG_RESULT([yes])
+	],
+	[
+		NO_FORMAT_TRUNCATION=
+		AC_MSG_RESULT([no])
+	])
+
+	CFLAGS="$saved_flags"
+	AC_SUBST([NO_FORMAT_TRUNCATION])
+])

zfs/config/user.m4

@@ -14,6 +14,9 @@ AC_DEFUN([ZFS_AC_CONFIG_USER], [
 	ZFS_AC_CONFIG_USER_LIBBLKID
 	ZFS_AC_CONFIG_USER_FRAME_LARGER_THAN
 	ZFS_AC_CONFIG_USER_RUNSTATEDIR
+	ZFS_AC_CONFIG_USER_MAKEDEV_IN_SYSMACROS
+	ZFS_AC_CONFIG_USER_MAKEDEV_IN_MKDEV
+	ZFS_AC_CONFIG_USER_NO_FORMAT_TRUNCATION
 dnl #
 dnl #	Checks for library functions
 	AC_CHECK_FUNCS([mlockall])