diff options
| author | Brian Behlendorf <[email protected]> | 2018-02-15 17:53:18 -0800 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2018-05-29 16:00:33 -0700 |
| commit | 93ce2b4ca5a40c41ac945cd3aaf4a4a22bb751e1 (patch) | |
| tree | 6832f5c9dfdbe0f0bd5c8708344a769676b1f95d /module/zcommon/zfs_deleg.c | |
| parent | 1272941f49321bcb7b26025670720c98785427ee (diff) | |
Update build system and packaging
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 <[email protected]>
Reviewed-by: Olaf Faaland <[email protected]>
Reviewed-by: Matthew Ahrens <[email protected]>
Reviewed-by: Pavel Zakharov <[email protected]>
Signed-off-by: Brian Behlendorf <[email protected]>
TEST_ZIMPORT_SKIP="yes"
Closes #7556
Diffstat (limited to 'module/zcommon/zfs_deleg.c')
| -rw-r--r-- | module/zcommon/zfs_deleg.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/module/zcommon/zfs_deleg.c b/module/zcommon/zfs_deleg.c index c6ba278cf..8d98f720a 100644 --- a/module/zcommon/zfs_deleg.c +++ b/module/zcommon/zfs_deleg.c @@ -28,16 +28,15 @@ #include <sys/zfs_context.h> #if defined(_KERNEL) -#include <sys/systm.h> #include <sys/sunddi.h> #include <sys/ctype.h> #else #include <stdio.h> #include <unistd.h> -#include <strings.h> #include <libnvpair.h> #include <ctype.h> #endif +#include <sys/strings.h> #include <sys/dsl_deleg.h> #include "zfs_prop.h" #include "zfs_deleg.h" @@ -244,7 +243,7 @@ zfs_deleg_whokey(char *attr, zfs_deleg_who_type_t type, } } -#if defined(_KERNEL) && defined(HAVE_SPL) +#if defined(_KERNEL) EXPORT_SYMBOL(zfs_deleg_verify_nvlist); EXPORT_SYMBOL(zfs_deleg_whokey); EXPORT_SYMBOL(zfs_deleg_canonicalize_perm); |