mirror of
https://git.proxmox.com/git/mirror_zfs.git
synced 2026-05-22 02:27:36 +03:00
Revert "Avoid BUG in migrate_folio_extra"
This reverts commit b052035990.
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: Tony Hutter <hutter2@llnl.gov>
Reviewed-by: Brian Atkinson <batkinson@lanl.gov>
Signed-off-by: tstabrawa <59430211+tstabrawa@users.noreply.github.com>
Closes #16568
Closes #16723
This commit is contained in:
committed by
Brian Behlendorf
parent
b96845b632
commit
ae48c2f6a9
@@ -1,33 +0,0 @@
|
||||
dnl #
|
||||
dnl # Linux 5.18 uses invalidate_folio in lieu of invalidate_page
|
||||
dnl #
|
||||
AC_DEFUN([ZFS_AC_KERNEL_SRC_VFS_INVALIDATE_FOLIO], [
|
||||
ZFS_LINUX_TEST_SRC([vfs_has_invalidate_folio], [
|
||||
#include <linux/fs.h>
|
||||
|
||||
static void
|
||||
test_invalidate_folio(struct folio *folio, size_t offset,
|
||||
size_t len) {
|
||||
(void) folio; (void) offset; (void) len;
|
||||
return;
|
||||
}
|
||||
|
||||
static const struct address_space_operations
|
||||
aops __attribute__ ((unused)) = {
|
||||
.invalidate_folio = test_invalidate_folio,
|
||||
};
|
||||
],[])
|
||||
])
|
||||
|
||||
AC_DEFUN([ZFS_AC_KERNEL_VFS_INVALIDATE_FOLIO], [
|
||||
dnl #
|
||||
dnl # Linux 5.18 uses invalidate_folio in lieu of invalidate_page
|
||||
dnl #
|
||||
AC_MSG_CHECKING([whether invalidate_folio exists])
|
||||
ZFS_LINUX_TEST_RESULT([vfs_has_invalidate_folio], [
|
||||
AC_MSG_RESULT([yes])
|
||||
AC_DEFINE(HAVE_VFS_INVALIDATE_FOLIO, 1, [invalidate_folio exists])
|
||||
],[
|
||||
AC_MSG_RESULT([no])
|
||||
])
|
||||
])
|
||||
@@ -1,32 +0,0 @@
|
||||
dnl #
|
||||
dnl # Linux 5.19 uses release_folio in lieu of releasepage
|
||||
dnl #
|
||||
AC_DEFUN([ZFS_AC_KERNEL_SRC_VFS_RELEASE_FOLIO], [
|
||||
ZFS_LINUX_TEST_SRC([vfs_has_release_folio], [
|
||||
#include <linux/fs.h>
|
||||
|
||||
static bool
|
||||
test_release_folio(struct folio *folio, gfp_t gfp) {
|
||||
(void) folio; (void) gfp;
|
||||
return (0);
|
||||
}
|
||||
|
||||
static const struct address_space_operations
|
||||
aops __attribute__ ((unused)) = {
|
||||
.release_folio = test_release_folio,
|
||||
};
|
||||
],[])
|
||||
])
|
||||
|
||||
AC_DEFUN([ZFS_AC_KERNEL_VFS_RELEASE_FOLIO], [
|
||||
dnl #
|
||||
dnl # Linux 5.19 uses release_folio in lieu of releasepage
|
||||
dnl #
|
||||
AC_MSG_CHECKING([whether release_folio exists])
|
||||
ZFS_LINUX_TEST_RESULT([vfs_has_release_folio], [
|
||||
AC_MSG_RESULT([yes])
|
||||
AC_DEFINE(HAVE_VFS_RELEASE_FOLIO, 1, [release_folio exists])
|
||||
],[
|
||||
AC_MSG_RESULT([no])
|
||||
])
|
||||
])
|
||||
@@ -77,8 +77,6 @@ AC_DEFUN([ZFS_AC_KERNEL_TEST_SRC], [
|
||||
ZFS_AC_KERNEL_SRC_SGET
|
||||
ZFS_AC_KERNEL_SRC_VFS_FILEMAP_DIRTY_FOLIO
|
||||
ZFS_AC_KERNEL_SRC_VFS_READ_FOLIO
|
||||
ZFS_AC_KERNEL_SRC_VFS_RELEASE_FOLIO
|
||||
ZFS_AC_KERNEL_SRC_VFS_INVALIDATE_FOLIO
|
||||
ZFS_AC_KERNEL_SRC_VFS_FSYNC_2ARGS
|
||||
ZFS_AC_KERNEL_SRC_VFS_DIRECT_IO
|
||||
ZFS_AC_KERNEL_SRC_VFS_READPAGES
|
||||
@@ -189,8 +187,6 @@ AC_DEFUN([ZFS_AC_KERNEL_TEST_RESULT], [
|
||||
ZFS_AC_KERNEL_SGET
|
||||
ZFS_AC_KERNEL_VFS_FILEMAP_DIRTY_FOLIO
|
||||
ZFS_AC_KERNEL_VFS_READ_FOLIO
|
||||
ZFS_AC_KERNEL_VFS_RELEASE_FOLIO
|
||||
ZFS_AC_KERNEL_VFS_INVALIDATE_FOLIO
|
||||
ZFS_AC_KERNEL_VFS_FSYNC_2ARGS
|
||||
ZFS_AC_KERNEL_VFS_DIRECT_IO
|
||||
ZFS_AC_KERNEL_VFS_READPAGES
|
||||
|
||||
Reference in New Issue
Block a user