git: 47bb16f8f092 - main - zfs: merge openzfs/zfs@03e9caaec
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 17 Nov 2023 08:57:00 UTC
The branch main has been updated by mm:
URL: https://cgit.FreeBSD.org/src/commit/?id=47bb16f8f09238e8d46e9e441a837e4bb28f6a00
commit 47bb16f8f09238e8d46e9e441a837e4bb28f6a00
Merge: 70e30addafe4 03e9caaec006
Author: Martin Matuska <mm@FreeBSD.org>
AuthorDate: 2023-11-17 08:39:42 +0000
Commit: Martin Matuska <mm@FreeBSD.org>
CommitDate: 2023-11-17 08:39:42 +0000
zfs: merge openzfs/zfs@03e9caaec
Notable upstream pull request merges:
#15516 da51bd17e Fix snap_obj_array memory leak in check_filesystem()
#15519 35da34516 L2ARC: Restrict write size to 1/4 of the device
#15529 03e9caaec Add a tunable to disable BRT support
Obtained from: OpenZFS
OpenZFS commit: 03e9caaec006134b3db9d02ac40fe9369ee78b03
sys/contrib/openzfs/.gitignore | 1 +
sys/contrib/openzfs/META | 2 +-
.../cmd/zpool/compatibility.d/openzfsonosx-1.8.1 | 1 -
sys/contrib/openzfs/configure.ac | 1 +
.../contrib/debian/{changelog => changelog.in} | 6 +++++
.../openzfs/include/os/linux/spl/sys/kmem_cache.h | 4 +--
.../include/os/linux/zfs/sys/zfs_vfsops_os.h | 2 ++
sys/contrib/openzfs/include/sys/vdev_raidz_impl.h | 4 +--
sys/contrib/openzfs/man/man4/spl.4 | 8 ------
sys/contrib/openzfs/man/man4/zfs.4 | 5 ++++
sys/contrib/openzfs/man/man7/zpool-features.7 | 9 +++++++
sys/contrib/openzfs/module/Kbuild.in | 4 +++
.../openzfs/module/os/linux/spl/spl-kmem-cache.c | 11 --------
.../openzfs/module/os/linux/zfs/zfs_vnops_os.c | 4 +++
.../openzfs/module/os/linux/zfs/zpl_file_range.c | 5 ++++
sys/contrib/openzfs/module/zfs/arc.c | 30 +++-------------------
sys/contrib/openzfs/module/zfs/spa_errlog.c | 6 +++--
.../openzfs/tests/zfs-tests/include/libtest.shlib | 15 +++++++++++
.../openzfs/tests/zfs-tests/include/tunables.cfg | 1 +
.../tests/functional/block_cloning/cleanup.ksh | 4 +++
.../tests/functional/block_cloning/setup.ksh | 5 ++++
.../tests/functional/cache/cache_012_pos.ksh | 20 +++++----------
.../zpool_create/zpool_create_features_007_pos.ksh | 10 +++++---
23 files changed, 87 insertions(+), 71 deletions(-)
diff --cc sys/contrib/openzfs/.gitignore
index 47d17ae16d34,000000000000..a2cb92dd5406
mode 100644,000000..100644
--- a/sys/contrib/openzfs/.gitignore
+++ b/sys/contrib/openzfs/.gitignore
@@@ -1,89 -1,0 +1,90 @@@
+#
+# This is the top-level .gitignore file:
+# ignore everything except a list of allowed files.
+#
+# This is not the place for entries that are specific to
+# a subdirectory. Instead add those files to the
+# .gitignore file in that subdirectory.
+#
+# N.B.
+# Please use 'git ls-files -i --exclude-standard'
+# command after changing this file, to see if there are
+# any tracked files which get ignored after the change.
+
+*
+
+!.github
+!cmd
+!config
+!contrib
+!etc
+!include
+!lib
+!man
+!module
+!rpm
+!scripts
+!tests
+!udev
+
+!.github/**
+!cmd/**
+!config/**
+!contrib/**
+!etc/**
+!include/**
+!lib/**
+!man/**
+!module/**
+!rpm/**
+!scripts/**
+!tests/**
+!udev/**
+
+!.editorconfig
+!.cirrus.yml
+!.gitignore
+!.gitmodules
+!.mailmap
+!AUTHORS
+!autogen.sh
+!CODE_OF_CONDUCT.md
+!configure.ac
+!copy-builtin
+!COPYRIGHT
+!LICENSE
+!Makefile.am
+!META
+!NEWS
+!NOTICE
+!README.md
+!RELEASES.md
+!TEST
+!zfs.release.in
+
+#
+# Normal rules
+#
+*.[oa]
+*.o.ur-safe
+*.lo
+*.la
+*.mod.c
+*~
+*.swp
+*.gcno
+*.gcda
+*.pyc
+*.pyo
+.deps
+.libs
+.dirstamp
+.DS_Store
+modules.order
+Makefile
+Makefile.in
++changelog
+*.patch
+*.orig
+*.tmp
+*.log