diff options
author | Martin Matuska <mm@FreeBSD.org> | 2023-06-17 07:14:08 +0000 |
---|---|---|
committer | Martin Matuska <mm@FreeBSD.org> | 2023-06-17 07:14:08 +0000 |
commit | e6c1e181ba7f666e02b073be104eb3e241097d83 (patch) | |
tree | 2e3231f43c7d3c51cb06b06aced314be55adc549 /sys/contrib/openzfs/config/kernel-writepage_t.m4 | |
parent | ded54059fddd6cbe0a2dea7c3f8d35cff5661505 (diff) | |
parent | 86783d7d92cf7a859464719a917fdff845b9a9e1 (diff) | |
download | src-e6c1e181ba7f666e02b073be104eb3e241097d83.tar.gz src-e6c1e181ba7f666e02b073be104eb3e241097d83.zip |
zfs: merge openzfs/zfs@86783d7d9 (zfs-2.1-release) into stable/13
OpenZFS release 2.1.12
Notable upstream pull requeset merges:
#14145 Storage device expansion "silently" fails on degraded vdev
#14358 Wait for txg sync if the last DRR_FREEOBJECTS might result in
a hole
#14410 Improve resilver ETAs
#14428 Resilver performance tuning
#14501 FreeBSD: don't verify recycled vnode for zfs control directory
#14524 Ignore too large stack in case of dsl_deadlist_merge
#14659 Allow MMP to bypass waiting for other threads
#14722 Fix "Detach spare vdev in case if resilvering does not happen"
#14774 FreeBSD .zfs fixups
#14776 FreeBSD: make zfs_vfs_held() definition consistent with
declaration
#14788 FreeBSD: add missing vop_fplookup assignments
#14794 zpool import -m also removing spare and cache when log device
is missing
#14795 Fix positive ABD size assertion in abd_verify()
#14798 Mark TX_COMMIT transaction with TXG_NOTHROTTLE
#14811 Refine special_small_blocks property validation
#14816 Fix two abd_gang_add_gang() issues
#14819 Add dmu_tx_hold_append() interface
#14823 Remove single parent assertion from zio_nowait()
#14853 zil: Don't expect zio_shrink() to succeed
#14861 Probe vdevs before marking removed
#14873 Add the ability to uninitialize a zpool
#14892 Fix concurrent resilvers initiated at same time
#14903 Fix NULL pointer dereference when doing concurrent 'send'
operations
#14910 ZIL: Allow to replay blocks of any size
Obtained from: OpenZFS
OpenZFS tag: zfs-2.1.12
OpenZFS commit: 86783d7d92cf7a859464719a917fdff845b9a9e1
Relnotes: yes
Diffstat (limited to 'sys/contrib/openzfs/config/kernel-writepage_t.m4')
-rw-r--r-- | sys/contrib/openzfs/config/kernel-writepage_t.m4 | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/sys/contrib/openzfs/config/kernel-writepage_t.m4 b/sys/contrib/openzfs/config/kernel-writepage_t.m4 new file mode 100644 index 000000000000..3a0cffd98570 --- /dev/null +++ b/sys/contrib/openzfs/config/kernel-writepage_t.m4 @@ -0,0 +1,26 @@ +AC_DEFUN([ZFS_AC_KERNEL_SRC_WRITEPAGE_T], [ + dnl # + dnl # 6.3 API change + dnl # The writepage_t function type now has its first argument as + dnl # struct folio* instead of struct page* + dnl # + ZFS_LINUX_TEST_SRC([writepage_t_folio], [ + #include <linux/writeback.h> + int putpage(struct folio *folio, + struct writeback_control *wbc, void *data) + { return 0; } + writepage_t func = putpage; + ],[]) +]) + +AC_DEFUN([ZFS_AC_KERNEL_WRITEPAGE_T], [ + AC_MSG_CHECKING([whether int (*writepage_t)() takes struct folio*]) + ZFS_LINUX_TEST_RESULT([writepage_t_folio], [ + AC_MSG_RESULT(yes) + AC_DEFINE(HAVE_WRITEPAGE_T_FOLIO, 1, + [int (*writepage_t)() takes struct folio*]) + ],[ + AC_MSG_RESULT(no) + ]) +]) + |