LU-6105 build: Update SPL/ZFS version to 0.6.3-1.2

Update to latest release of ZFS & SPL:
Includes fixes compatibility with kernels up through 3.17 and fixes
SPL mutex_exit races.

Also address redefinition of SHRINK_STOP between SPL and Lustre.  Both
use the same numeric value -1 but in ways that cause gcc to complain.

Test-Parameters: mdtfilesystemtype=zfs mdsfilesystemtype=zfs ostfilesystemtype=zfs testlist=sanity,sanity,sanity,sanity,sanity,sanity,sanity
Signed-off-by: Nathaniel Clark <nathaniel.l.clark@intel.com>
Change-Id: I2ba0119d3535beb3bae1b47021c5a167ce25e129
Reviewed-on: http://review.whamcloud.com/13322
Reviewed-by: Alex Zhuravlev <alexey.zhuravlev@intel.com>
Reviewed-by: Isaac Huang <he.huang@intel.com>
Tested-by: Maloo <hpdd-maloo@intel.com>
Tested-by: Jenkins
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>

diff --git a/contrib/lbuild/lbuild b/contrib/lbuild/lbuild
index a0da907..f4bd2a0 100755 (executable)
--- a/contrib/lbuild/lbuild
+++ b/contrib/lbuild/lbuild
@@ -1053,7 +1053,7 @@ build_spl_zfs() {
     # The spl/zfs spec files expect RPM_BUILD_ROOT to point to the root of the
     # destination for the rpms
     export RPM_BUILD_ROOT=$TOPDIR
-    SPLZFSVER=${SPLZFSVER:-0.6.3-1.1}
+    SPLZFSVER=${SPLZFSVER:-0.6.3-1.2}
     SPLZFSTAG=${SPLZFSTAG:-}
 
     # The files expect a kver to be set to the kernel version .

diff --git a/lustre/osd-zfs/osd_internal.h b/lustre/osd-zfs/osd_internal.h
index 536da7e..10791a5 100644 (file)
--- a/lustre/osd-zfs/osd_internal.h
+++ b/lustre/osd-zfs/osd_internal.h
@@ -49,6 +49,9 @@
 #include <lustre_quota.h>
 
 #define _SPL_KMEM_H
+/* SPL redefines this but to the same value: ~0UL vs -1, but GCC complains.
+ * fixed in SPL master 52479ecf58fa89190e384edcf838fecccc786af5 */
+#undef SHRINK_STOP
 #include <sys/kstat.h>
 #define kmem_zalloc(a, b)      kzalloc(a, b)
 #define kmem_free(ptr, sz)     ((void)(sz), kfree(ptr))