mirror of
https://git.proxmox.com/git/mirror_zfs.git
synced 2024-12-25 18:59:33 +03:00
93ce2b4ca5
Minimal changes required to integrate the SPL sources in to the
ZFS repository build infrastructure and packaging.
Build system and packaging:
* Renamed SPL_* autoconf m4 macros to ZFS_*.
* Removed redundant SPL_* autoconf m4 macros.
* Updated the RPM spec files to remove SPL package dependency.
* The zfs package obsoletes the spl package, and the zfs-kmod
package obsoletes the spl-kmod package.
* The zfs-kmod-devel* packages were updated to add compatibility
symlinks under /usr/src/spl-x.y.z until all dependent packages
can be updated. They will be removed in a future release.
* Updated copy-builtin script for in-kernel builds.
* Updated DKMS package to include the spl.ko.
* Updated stale AUTHORS file to include all contributors.
* Updated stale COPYRIGHT and included the SPL as an exception.
* Renamed README.markdown to README.md
* Renamed OPENSOLARIS.LICENSE to LICENSE.
* Renamed DISCLAIMER to NOTICE.
Required code changes:
* Removed redundant HAVE_SPL macro.
* Removed _BOOT from nvpairs since it doesn't apply for Linux.
* Initial header cleanup (removal of empty headers, refactoring).
* Remove SPL repository clone/build from zimport.sh.
* Use of DEFINE_RATELIMIT_STATE and DEFINE_SPINLOCK removed due
to build issues when forcing C99 compilation.
* Replaced legacy ACCESS_ONCE with READ_ONCE.
* Include needed headers for `current` and `EXPORT_SYMBOL`.
Reviewed-by: Tony Hutter <hutter2@llnl.gov>
Reviewed-by: Olaf Faaland <faaland1@llnl.gov>
Reviewed-by: Matthew Ahrens <mahrens@delphix.com>
Reviewed-by: Pavel Zakharov <pavel.zakharov@delphix.com>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
TEST_ZIMPORT_SKIP="yes"
Closes #7556
73 lines
1.9 KiB
Plaintext
73 lines
1.9 KiB
Plaintext
dnl #
|
|
dnl # 2.6.35 API change,
|
|
dnl # The cachep->gfpflags member was renamed cachep->allocflags. These are
|
|
dnl # private allocation flags which are applied when allocating a new slab
|
|
dnl # in kmem_getpages(). Unfortunately there is no public API for setting
|
|
dnl # non-default flags.
|
|
dnl #
|
|
AC_DEFUN([ZFS_AC_KERNEL_KMEM_CACHE_ALLOCFLAGS], [
|
|
AC_MSG_CHECKING([whether struct kmem_cache has allocflags])
|
|
ZFS_LINUX_TRY_COMPILE([
|
|
#include <linux/slab.h>
|
|
],[
|
|
struct kmem_cache cachep __attribute__ ((unused));
|
|
cachep.allocflags = GFP_KERNEL;
|
|
],[
|
|
AC_MSG_RESULT(yes)
|
|
AC_DEFINE(HAVE_KMEM_CACHE_ALLOCFLAGS, 1,
|
|
[struct kmem_cache has allocflags])
|
|
],[
|
|
AC_MSG_RESULT(no)
|
|
|
|
AC_MSG_CHECKING([whether struct kmem_cache has gfpflags])
|
|
ZFS_LINUX_TRY_COMPILE([
|
|
#include <linux/slab.h>
|
|
],[
|
|
struct kmem_cache cachep __attribute__ ((unused));
|
|
cachep.gfpflags = GFP_KERNEL;
|
|
],[
|
|
AC_MSG_RESULT(yes)
|
|
AC_DEFINE(HAVE_KMEM_CACHE_GFPFLAGS, 1,
|
|
[struct kmem_cache has gfpflags])
|
|
],[
|
|
AC_MSG_RESULT(no)
|
|
])
|
|
])
|
|
])
|
|
|
|
dnl #
|
|
dnl # grsecurity API change,
|
|
dnl # kmem_cache_create() with SLAB_USERCOPY flag replaced by
|
|
dnl # kmem_cache_create_usercopy().
|
|
dnl #
|
|
AC_DEFUN([ZFS_AC_KERNEL_KMEM_CACHE_CREATE_USERCOPY], [
|
|
AC_MSG_CHECKING([whether kmem_cache_create_usercopy() exists])
|
|
tmp_flags="$EXTRA_KCFLAGS"
|
|
EXTRA_KCFLAGS="-Werror"
|
|
ZFS_LINUX_TRY_COMPILE([
|
|
#include <linux/slab.h>
|
|
static void ctor(void *foo)
|
|
{
|
|
// fake ctor
|
|
}
|
|
],[
|
|
struct kmem_cache *skc_linux_cache;
|
|
const char *name = "test";
|
|
size_t size = 4096;
|
|
size_t align = 8;
|
|
unsigned long flags = 0;
|
|
size_t useroffset = 0;
|
|
size_t usersize = size - useroffset;
|
|
|
|
skc_linux_cache = kmem_cache_create_usercopy(
|
|
name, size, align, flags, useroffset, usersize, ctor);
|
|
],[
|
|
AC_MSG_RESULT(yes)
|
|
AC_DEFINE(HAVE_KMEM_CACHE_CREATE_USERCOPY, 1,
|
|
[kmem_cache_create_usercopy() exists])
|
|
],[
|
|
AC_MSG_RESULT(no)
|
|
])
|
|
EXTRA_KCFLAGS="$tmp_flags"
|
|
])
|