Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

zfs-2.1.5 patchset #13532

Merged
merged 97 commits into from
Jun 22, 2022
Merged
Changes from 1 commit
Commits
Show all changes
97 commits
Select commit Hold shift + click to select a range
5a21214
zfs, libzfs: diff: accept -h/ZFS_DIFF_NO_MANGLE, disabling path escaping
nabijaczleweli Dec 9, 2021
7fbb90f
libzfs: diff: stream_bytes: use fputc, %hho formats chars
nabijaczleweli Dec 9, 2021
fe6f265
etc/systemd/zfs-mount-generator: serialise, handle keylocation=http[s…
nabijaczleweli Nov 30, 2021
9f69435
Default to zfs_dmu_offset_next_sync=1
behlendorf Nov 30, 2021
5a9994f
Export minimal zfs_refcount interfaces
behlendorf Oct 11, 2021
a5a2872
FreeBSD: Use NDFREE_PNBUF if available
Apr 2, 2022
215a825
Linux 5.18 compat: 4-argument bio_alloc()
nabijaczleweli Mar 24, 2022
9f7f704
Linux 5.18 compat: replace genhd.h with blkdev.h includes
nabijaczleweli Mar 24, 2022
10a9f5f
Linux 5.18 compat: blkg_tryget is moved to private headers
ret2libc Apr 1, 2022
35ddd8e
Linux 5.18 compat: use address_space_operations->readahead
ret2libc Apr 1, 2022
1f4c79b
libzfs: sendrecv: always cancel progress thread in zfs_send_one()
nabijaczleweli Apr 4, 2022
ff23ef0
libzfs: import: zpool_clear_label: actually fail if clearing l2arc he…
nabijaczleweli Apr 7, 2022
e9cd90f
FreeBSD: Parameterize ZFS_ENTER/ZFS_VERIFY_VP with an error code
markjdb Apr 7, 2022
b7546f9
FreeBSD: Return Mach error codes from VOP_(GET|PUT)PAGES
markjdb Apr 7, 2022
aa1c3c1
Linux 5.17 compat: GENHD_FL_EXT_DEVT / GENHD_FL_NO_PART_SCAN
behlendorf Apr 19, 2022
361dc13
Document zfs inherit -S's interaction with noninheritable properties
nabijaczleweli Apr 16, 2022
c220771
Corrected oversight in ZERO_RANGE behavior
rincebrain Apr 20, 2022
972637d
FreeBSD: Fix translation from ABD to physical pages.
amotin Apr 19, 2022
6424260
Linux 5.18 compat: kobj_type.default_attrs replaced with default_groups
nabijaczleweli Apr 21, 2022
71cd372
Fix O_APPEND for Linux 3.15 and older kernels
behlendorf Apr 28, 2022
49c1346
Linux 5.18 compat: replace __set_page_dirty_nobuffers
behlendorf Apr 28, 2022
c0ff5f1
zfs: holds: dequadratify
nabijaczleweli Apr 28, 2022
ce8d41e
Skip spacemaps reading in case of pool readonly import
behlendorf Apr 28, 2022
a1a54b3
libzutil: zpool_find_config: remove unused variable
nabijaczleweli Jun 3, 2021
116d447
libzfs: zfs_send: remove unused variable
nabijaczleweli Jun 3, 2021
4149e19
module/zfs: arc: arc_hdr_realloc_crypt: remove unused variables
nabijaczleweli Jun 3, 2021
18e9268
module/zfs: dbuf: dbuf_read_impl: remove unused variable
nabijaczleweli Jun 3, 2021
986d64c
module/zfs: vdev_indirect: vdev_indirect_repair: remove unused variable
nabijaczleweli Jun 3, 2021
7536ad3
module/zfs: vdev_removal: spa_vdev_remove_thread: remove unused variable
nabijaczleweli Jun 3, 2021
b8e1366
zvol: remove unused variable
nabijaczleweli Dec 27, 2021
a175fe8
fm: remove unused variables
nabijaczleweli Dec 27, 2021
9e68b73
zvol: remove unused variable
nabijaczleweli Dec 27, 2021
a4f582f
FreeBSD: remove unused variable
nabijaczleweli Dec 23, 2021
ecec151
module: zfs: freebsd: fix unused, remove argsused
nabijaczleweli Dec 22, 2021
4c9c96a
Silence unused-but-set-variable warnings
behlendorf Apr 29, 2022
ce8ae06
Python 3.10 fixes, part 2
rincebrain Oct 29, 2021
bc03fee
Remove REMAKE_INITRD
kylosus Nov 30, 2021
0657247
contrib/dracut: zfs-lib: export_all: replace with inline zpool export -a
nabijaczleweli Feb 12, 2022
ae054e6
contrib: dracut: parse-zfs: drop initqueue-finished for i/f
nabijaczleweli Apr 4, 2022
b551725
contrib: dracut: parse-zfs: stop pretending we support FILESYSTEM=
nabijaczleweli Apr 4, 2022
0864c29
contrib; dracut: centralise root= parsing, actually support root=s
nabijaczleweli Apr 4, 2022
71a1d8e
contrib; dracut: flatten zfs-load-key, simplify zfs-env-bootfs
nabijaczleweli Apr 4, 2022
5c0aa40
contrib: dracut: zfs-lib: simplify ask_for_password
nabijaczleweli Apr 4, 2022
5c97f76
contrib: dracut: zfs-lib: remove find_bootfs
nabijaczleweli Apr 4, 2022
059a563
contrib: dracut: inline single-use import_pool, move single-use ask_f…
nabijaczleweli Apr 4, 2022
fc41be5
contrib: dracut: don't require essentials to be under the same encroot
nabijaczleweli Apr 4, 2022
a0e81a4
contrib: dracut: zfs-{rollback,snapshot}-bootfs: order after key loading
nabijaczleweli Apr 4, 2022
0947096
contrib: dracut: zfs-needshutdown: don't list
nabijaczleweli Apr 4, 2022
1781ee7
Add dracut.zfs.7
nabijaczleweli Apr 4, 2022
1184df6
contrib: dracut: remove getargbool polyfill
nabijaczleweli Apr 5, 2022
bb29f1e
Reduce dbuf_find() lock contention
behlendorf May 4, 2022
2a64eeb
man: zpool-import.8: -d -or -c
nabijaczleweli May 10, 2022
1467a1b
module: zstd: check we don't leak symbols; regenerate symbol map
nabijaczleweli Mar 15, 2022
1f31889
FreeBSD: Implement hole-punching support
khng300 Aug 4, 2021
1d54deb
zvol_wait: Ignore locked zvols
rlaager Apr 22, 2022
210b331
Strengthen Linux kernel capabilities detection
szubersk Apr 21, 2022
3bb068d
autoconf: Pretend `CONFIG_MODULES` is always on
szubersk Apr 26, 2022
60fc173
Adding ZERO_PAGE detection
bwatkinson Mar 14, 2022
13b1f33
PPC get_user workaround
szubersk Apr 26, 2022
756c3e0
autoconf: Fail when __copy_from_user_inatomic is a non-GPL symbol
szubersk May 7, 2022
2c5c8bb
FreeBSD: use zero_region instead of allocating a dedicated page
mjguzik May 4, 2022
eee389b
Fix functions without a prototype
aidanharris May 6, 2022
b28c0c4
abd_os: remove redundant refcount creation for abd_children
hpingfs May 9, 2022
0112bc2
Add missing AC_MSG_RESULT(no) to configure
behlendorf May 12, 2022
0514731
Fix compiler warnings about zero-length arrays in inline bitops
ckane May 17, 2022
0671f72
Make better use of dracut functions when building initramfs
savyajha Jan 25, 2022
ebbfc6c
Make dracut fail if essential files cannot be installed
savyajha Feb 6, 2022
4252517
Remove absolute paths to udev rules and binaries for dracut
savyajha Feb 14, 2022
115e059
Multiple dracut module install script cleanups
savyajha Feb 14, 2022
96c7c63
automake: don't install /e/d/zfs or /e/z/zfs-functions +x
nabijaczleweli May 24, 2022
4184b78
zdb: Fix handling of nul termination in symlink targets
markjdb May 20, 2022
5d534f1
zed: Take no action on scrub/resilver checksum errors
behlendorf May 24, 2022
5d9c527
Modified ncompress requirement in RPM to exclude RHEL9
rincebrain May 24, 2022
ed16dd7
Standardize RHEL version check in packages
behlendorf May 25, 2022
fde66e5
FreeBSD: libspl: Add locking around statfs globals
May 24, 2022
0a688b2
rpm: Keep debug symbols if configured with '--enable-debuginfo'
usaleem-ix May 25, 2022
2458c7e
zed: support subject as header in zed_notify_email()
heeplr May 18, 2022
090bda5
Silence unused-but-set-variable warning
May 26, 2022
5a639f0
Linux 5.18 compat: bio_alloc()
behlendorf May 27, 2022
9ce5eb1
Linux 5.19 compat: bdev_max_discard_sectors()
behlendorf May 27, 2022
048301b
Linux 5.19 compat: bdev_max_secure_erase_sectors()
behlendorf May 27, 2022
7ae5ea8
Linux 5.19 compat: blkdev_issue_secure_erase()
behlendorf May 27, 2022
fec407f
Linux 5.19 compat: aops->read_folio()
behlendorf May 27, 2022
ee84970
Linux 5.19 compat: bdev_start_io_acct() / bdev_end_io_acct()
behlendorf May 27, 2022
69430e3
Linux 5.19 compat: zap_flags_t conflict
behlendorf May 27, 2022
1c4e6a3
Linux 5.19 compat: asm/fpu/internal.h
behlendorf Jun 1, 2022
db530f6
autoconf: AC_MSG_CHECKING consistency
behlendorf May 31, 2022
fc18fa9
Linux 5.18 compat: META
behlendorf May 31, 2022
2712411
Reject zfs send -RI with nonexistent fromsnap
rincebrain Oct 4, 2021
56eed50
libzfs: mount: don't leak mnt_param_t if mnt_func fails
nabijaczleweli Jan 12, 2022
1fdd768
libzfs: Fail making a dataset handle gracefully
Feb 18, 2022
3381885
Remove wrong assertion in log spacemap
amotin Jun 1, 2022
cc565f5
Corrected edge case in uncompressed ARC->L2ARC handling
rincebrain May 4, 2022
6ff89fe
Improve sorted scan memory accounting
amotin Jun 10, 2022
403d4bc
FreeBSD: Silence clang unused-but-set-variable
Jun 15, 2022
6e95413
Remove install of zfs-load-module.service for dracut
prometheanfire Jun 21, 2022
6c3c5fc
Tag zfs-2.1.5
tonyhutter Jun 21, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Linux 5.18 compat: blkg_tryget is moved to private headers
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Riccardo Schirone <[email protected]>
Closes #13278
ret2libc authored and behlendorf committed Apr 6, 2022
commit 10a9f5fc47acc6c9d3475023001264ca5fb741a6
7 changes: 5 additions & 2 deletions module/os/linux/zfs/vdev_disk.c
Original file line number Diff line number Diff line change
@@ -467,8 +467,11 @@ vdev_submit_bio_impl(struct bio *bio)
* blkg_tryget() to use rcu_read_lock() instead of rcu_read_lock_sched().
* As a side effect the function was converted to GPL-only. Define our
* own version when needed which uses rcu_read_lock_sched().
*
* The Linux 5.17 kernel split linux/blk-cgroup.h into a private and a public
* part, moving blkg_tryget into the private one. Define our own version.
*/
#if defined(HAVE_BLKG_TRYGET_GPL_ONLY)
#if defined(HAVE_BLKG_TRYGET_GPL_ONLY) || !defined(HAVE_BLKG_TRYGET)
static inline bool
vdev_blkg_tryget(struct blkcg_gq *blkg)
{
@@ -493,7 +496,7 @@ vdev_blkg_tryget(struct blkcg_gq *blkg)

return (rc);
}
#elif defined(HAVE_BLKG_TRYGET)
#else
#define vdev_blkg_tryget(bg) blkg_tryget(bg)
#endif
#ifdef HAVE_BIO_SET_DEV_MACRO