Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch

META

@@ -4,3 +4,5 @@ Branch:       1.0
 Version:      0.4.7
 Release:      1
 Release-Tags: relext
+License:      CDDL
+Author:       Sun Microsystems/Oracle, Lawrence Livermore National Laboratory

config/kernel.m4

@@ -4,6 +4,7 @@ dnl #
 AC_DEFUN([ZFS_AC_CONFIG_KERNEL], [
 	ZFS_AC_KERNEL
 	ZFS_AC_SPL
+	ZFS_AC_KERNEL_CONFIG
 	ZFS_AC_KERNEL_BDEV_BLOCK_DEVICE_OPERATIONS
 	ZFS_AC_KERNEL_TYPE_FMODE_T
 	ZFS_AC_KERNEL_OPEN_BDEV_EXCLUSIVE
@@ -238,6 +239,30 @@ AC_DEFUN([ZFS_AC_SPL], [
 	ZFS_AC_SPL_MODULE_SYMVERS
 ])
 
+dnl #
+dnl # There are certain kernel build options which when enabled are
+dnl # completely incompatible with non GPL kernel modules.  It is best
+dnl # to detect these at configure time and fail with a clear error
+dnl # rather than build everything and fail during linking.
+dnl #
+dnl # CONFIG_DEBUG_LOCK_ALLOC - Maps mutex_lock() to mutex_lock_nested()
+dnl #
+AC_DEFUN([ZFS_AC_KERNEL_CONFIG], [
+
+	if test "$ZFS_META_LICENSE" = CDDL; then
+		ZFS_LINUX_CONFIG([DEBUG_LOCK_ALLOC],
+		AC_MSG_ERROR([
+		*** Kernel built with CONFIG_DEBUG_LOCK_ALLOC which is
+		*** incompatible with the CDDL license.  You must rebuild
+		*** your kernel without this option.]), [])
+	fi
+
+	if test "$ZFS_META_LICENSE" = GPL; then
+		AC_DEFINE([HAVE_GPL_ONLY_SYMBOLS], [1],
+			[Define to 1 if licensed under the GPL])
+	fi
+])
+
 dnl #
 dnl # ZFS_LINUX_CONFTEST
 dnl #

config/zfs-build.m4

@@ -1,13 +1,9 @@
 AC_DEFUN([ZFS_AC_LICENSE], [
-	AC_MSG_CHECKING([zfs license])
+	AC_MSG_CHECKING([zfs author])
-	LICENSE=`grep MODULE_LICENSE module/zfs/zfs_ioctl.c | cut -f2 -d'"'`
+	AC_MSG_RESULT([$ZFS_META_AUTHOR])
-	AC_MSG_RESULT([$LICENSE])
-	if test "$LICENSE" = GPL; then
-		AC_DEFINE([HAVE_GPL_ONLY_SYMBOLS], [1],
-		          [Define to 1 if module is licensed under the GPL])
-	fi
 
-	AC_SUBST(LICENSE)
+	AC_MSG_CHECKING([zfs license])
+	AC_MSG_RESULT([$ZFS_META_LICENSE])
 ])
 
 AC_DEFUN([ZFS_AC_DEBUG], [

config/zfs-meta.m4

@@ -48,6 +48,14 @@ AC_DEFUN([ZFS_AC_META], [
 			AC_SUBST([ZFS_META_RELEASE])
 		fi
 
+		ZFS_META_LICENSE=_ZFS_AC_META_GETVAL([LICENSE]);
+		if test -n "$ZFS_META_LICENSE"; then
+			AC_DEFINE_UNQUOTED([ZFS_META_LICENSE], ["$ZFS_META_LICENSE"],
+				[Define the project license.]
+			)
+			AC_SUBST([ZFS_META_LICENSE])
+		fi
+
 		if test -n "$ZFS_META_NAME" -a -n "$ZFS_META_VERSION"; then
 				ZFS_META_ALIAS="$ZFS_META_NAME-$ZFS_META_VERSION"
 				test -n "$ZFS_META_RELEASE" && 

module/avl/avl.c

@@ -1033,15 +1033,17 @@ done:
 }
 
 #if defined(_KERNEL) && defined(HAVE_SPL)
+#include "zfs_config.h"
+
 static int avl_init(void) { return 0; }
 static int avl_fini(void) { return 0; }
 
 spl_module_init(avl_init);
 spl_module_exit(avl_fini);
 
-MODULE_AUTHOR("Sun Microsystems, Inc");
 MODULE_DESCRIPTION("Generic AVL tree implementation");
-MODULE_LICENSE("CDDL");
+MODULE_AUTHOR(ZFS_META_AUTHOR);
+MODULE_LICENSE(ZFS_META_LICENSE);
 
 EXPORT_SYMBOL(avl_create);
 EXPORT_SYMBOL(avl_find);

module/nvpair/nvpair.c

@@ -3246,15 +3246,17 @@ nvs_xdr(nvstream_t *nvs, nvlist_t *nvl, char *buf, size_t *buflen)
 }
 
 #if defined(_KERNEL) && defined(HAVE_SPL)
+#include "zfs_config.h"
+
 static int nvpair_init(void) { return 0; }
 static int nvpair_fini(void) { return 0; }
 
 spl_module_init(nvpair_init);
 spl_module_exit(nvpair_fini);
 
-MODULE_AUTHOR("Sun Microsystems, Inc");
 MODULE_DESCRIPTION("Generic name/value pair implementation");
-MODULE_LICENSE("CDDL");
+MODULE_AUTHOR(ZFS_META_AUTHOR);
+MODULE_LICENSE(ZFS_META_LICENSE);
 
 EXPORT_SYMBOL(nv_alloc_init);
 EXPORT_SYMBOL(nv_alloc_reset);

module/unicode/u8_textprep.c

@@ -2133,15 +2133,17 @@ u8_textprep_str(char *inarray, size_t *inlen, char *outarray, size_t *outlen,
 }
 
 #if defined(_KERNEL) && defined(HAVE_SPL)
+#include "zfs_config.h"
+
 static int unicode_init(void) { return 0; }
 static int unicode_fini(void) { return 0; }
 
 spl_module_init(unicode_init);
 spl_module_exit(unicode_fini);
 
-MODULE_AUTHOR("Sun Microsystems, Inc");
 MODULE_DESCRIPTION("Unicode implementation");
-MODULE_LICENSE("CDDL");
+MODULE_AUTHOR(ZFS_META_AUTHOR);
+MODULE_LICENSE(ZFS_META_LICENSE);
 
 EXPORT_SYMBOL(u8_validate);
 EXPORT_SYMBOL(u8_strcmp);

module/zcommon/zfs_prop.c

@@ -534,15 +534,17 @@ zfs_prop_align_right(zfs_prop_t prop)
 #endif
 
 #if defined(_KERNEL) && defined(HAVE_SPL)
+#include "zfs_config.h"
+
 static int zcommon_init(void) { return 0; }
 static int zcommon_fini(void) { return 0; }
 
 spl_module_init(zcommon_init);
 spl_module_exit(zcommon_fini);
 
-MODULE_AUTHOR("Sun Microsystems, Inc");
 MODULE_DESCRIPTION("Generic ZFS support");
-MODULE_LICENSE("CDDL");
+MODULE_AUTHOR(ZFS_META_AUTHOR);
+MODULE_LICENSE(ZFS_META_LICENSE);
 
 /* zfs dataset property functions */
 EXPORT_SYMBOL(zfs_userquota_prop_prefixes);

module/zfs/zfs_ioctl.c

@@ -3867,7 +3867,7 @@ _fini(void)
 spl_module_init(_init);
 spl_module_exit(_fini);
 
-MODULE_AUTHOR("Sun Microsystems, Inc");
 MODULE_DESCRIPTION("ZFS");
-MODULE_LICENSE("CDDL");
+MODULE_AUTHOR(ZFS_META_AUTHOR);
+MODULE_LICENSE(ZFS_META_LICENSE);
 #endif /* HAVE_SPL */