diff options
| author | Martin Matuska <mm@FreeBSD.org> | 2022-06-03 15:58:39 +0000 |
|---|---|---|
| committer | Martin Matuska <mm@FreeBSD.org> | 2022-06-03 16:17:53 +0000 |
| commit | e3aa18ad71782a73d3dd9dd3d526bbd2b607ca16 (patch) | |
| tree | 6c0de524d7951bac89d34ea7e67c7c8c87974c23 /sys/contrib/openzfs/config/kernel-vfs-filemap_dirty_folio.m4 | |
| parent | 645886d028c85b3cb9fb36e96b1edc661cf4c0d8 (diff) | |
| parent | b9d98453f9387c413f91d1d9cdb0cba8e04dbd95 (diff) | |
| download | src-e3aa18ad71782a73d3dd9dd3d526bbd2b607ca16.tar.gz src-e3aa18ad71782a73d3dd9dd3d526bbd2b607ca16.zip | |
zfs: merge openzfs/zfs@b9d98453f
Notable upstream pull request merges:
#12321 Fix inflated quiesce time caused by lwb_tx during zil_commit()
#13244 zstd early abort
#13360 Verify BPs as part of spa_load_verify_cb()
#13452 More speculative prefetcher improvements
#13466 Expose zpool guids through kstats
#13476 Refactor Log Size Limit
#13484 FreeBSD: libspl: Add locking around statfs globals
#13498 Cancel in-progress rebuilds when we finish removal
#13499 zed: Take no action on scrub/resilver checksum errors
#13513 Remove wrong assertion in log spacemap
Obtained from: OpenZFS
OpenZFS commit: b9d98453f9387c413f91d1d9cdb0cba8e04dbd95
Diffstat (limited to 'sys/contrib/openzfs/config/kernel-vfs-filemap_dirty_folio.m4')
| -rw-r--r-- | sys/contrib/openzfs/config/kernel-vfs-filemap_dirty_folio.m4 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/contrib/openzfs/config/kernel-vfs-filemap_dirty_folio.m4 b/sys/contrib/openzfs/config/kernel-vfs-filemap_dirty_folio.m4 index 872879002928..729ca670da03 100644 --- a/sys/contrib/openzfs/config/kernel-vfs-filemap_dirty_folio.m4 +++ b/sys/contrib/openzfs/config/kernel-vfs-filemap_dirty_folio.m4 @@ -19,7 +19,7 @@ AC_DEFUN([ZFS_AC_KERNEL_VFS_FILEMAP_DIRTY_FOLIO], [ dnl # Linux 5.18 uses filemap_dirty_folio in lieu of dnl # ___set_page_dirty_nobuffers dnl # - AC_MSG_CHECKING([filemap_dirty_folio exists]) + AC_MSG_CHECKING([whether filemap_dirty_folio exists]) ZFS_LINUX_TEST_RESULT([vfs_has_filemap_dirty_folio], [ AC_MSG_RESULT([yes]) AC_DEFINE(HAVE_VFS_FILEMAP_DIRTY_FOLIO, 1, |