forked from openzfs/zfs
-
Notifications
You must be signed in to change notification settings - Fork 5
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #138 from truenas/truenas/zfs-2.1-release
[stable/bluefin] Sync with truenas/zfs-2.1-release
- Loading branch information
Showing
121 changed files
with
2,670 additions
and
455 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,10 +1,10 @@ | ||
Meta: 1 | ||
Name: zfs | ||
Branch: 1.0 | ||
Version: 2.1.11 | ||
Version: 2.1.12 | ||
Release: 1 | ||
Release-Tags: relext | ||
License: CDDL | ||
Author: OpenZFS | ||
Linux-Maximum: 6.2 | ||
Linux-Maximum: 6.3 | ||
Linux-Minimum: 3.10 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,29 @@ | ||
dnl # | ||
dnl # cpu_has_feature() may referencing GPL-only cpu_feature_keys on powerpc | ||
dnl # | ||
|
||
dnl # | ||
dnl # Checking if cpu_has_feature is exported GPL-only | ||
dnl # | ||
AC_DEFUN([ZFS_AC_KERNEL_SRC_CPU_HAS_FEATURE], [ | ||
ZFS_LINUX_TEST_SRC([cpu_has_feature], [ | ||
#include <linux/version.h> | ||
#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0) | ||
#include <asm/cpu_has_feature.h> | ||
#else | ||
#include <asm/cputable.h> | ||
#endif | ||
], [ | ||
return cpu_has_feature(CPU_FTR_ALTIVEC) ? 0 : 1; | ||
], [], [ZFS_META_LICENSE]) | ||
]) | ||
AC_DEFUN([ZFS_AC_KERNEL_CPU_HAS_FEATURE], [ | ||
AC_MSG_CHECKING([whether cpu_has_feature() is GPL-only]) | ||
ZFS_LINUX_TEST_RESULT([cpu_has_feature_license], [ | ||
AC_MSG_RESULT(no) | ||
], [ | ||
AC_MSG_RESULT(yes) | ||
AC_DEFINE(HAVE_CPU_HAS_FEATURE_GPL_ONLY, 1, | ||
[cpu_has_feature() is GPL-only]) | ||
]) | ||
]) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,26 @@ | ||
dnl # | ||
dnl # filemap_range_has_page was not available till 4.13 | ||
dnl # | ||
AC_DEFUN([ZFS_AC_KERNEL_SRC_FILEMAP], [ | ||
ZFS_LINUX_TEST_SRC([filemap_range_has_page], [ | ||
#include <linux/fs.h> | ||
],[ | ||
struct address_space *mapping = NULL; | ||
loff_t lstart = 0; | ||
loff_t lend = 0; | ||
bool ret __attribute__ ((unused)); | ||
ret = filemap_range_has_page(mapping, lstart, lend); | ||
]) | ||
]) | ||
|
||
AC_DEFUN([ZFS_AC_KERNEL_FILEMAP], [ | ||
AC_MSG_CHECKING([whether filemap_range_has_page() is available]) | ||
ZFS_LINUX_TEST_RESULT([filemap_range_has_page], [ | ||
AC_MSG_RESULT(yes) | ||
AC_DEFINE(HAVE_FILEMAP_RANGE_HAS_PAGE, 1, | ||
[filemap_range_has_page() is available]) | ||
],[ | ||
AC_MSG_RESULT(no) | ||
]) | ||
]) |
Oops, something went wrong.