diff options
| author | Martin Matuska <mm@FreeBSD.org> | 2022-10-04 18:16:52 +0000 |
|---|---|---|
| committer | Martin Matuska <mm@FreeBSD.org> | 2022-10-04 18:16:52 +0000 |
| commit | be181ee2a28aa2b4b0e76684bce9f673ef668874 (patch) | |
| tree | 3594f08f35049ed06224974f8464c2c3b7bf9426 /sys/modules | |
| parent | 6a720fb95a1bc39c6417fa6200789edfe99d5256 (diff) | |
| parent | d62bafee9fc38f8b9653c531e1861e83dcba4618 (diff) | |
| download | src-be181ee2a28aa2b4b0e76684bce9f673ef668874.tar.gz src-be181ee2a28aa2b4b0e76684bce9f673ef668874.zip | |
zfs: merge openzfs/zfs@d62bafee9
Notable upstream pull request merges:
#13857 Enforce "-F" flag on resuming recv of full/newfs on existing dataset
#13928 Revert "Reduce dbuf_find() lock contention"
#13928 Dynamically size dbuf hash mutex array
#13930 zpool: Don't print "repairing" on force faulted drives
#13938 Bring per_txg_dirty_frees_percent back to 30
#13939 Fix panic in dsl_process_sub_livelist for EINTR
#13954 Fix bad free in skein code
#13967 Fix potential NULL pointer dereference in dsl_dataset_promote_check()
Obtained from: OpenZFS
OpenZFS commit: d62bafee9fc38f8b9653c531e1861e83dcba4618
Diffstat (limited to 'sys/modules')
| -rw-r--r-- | sys/modules/zfs/zfs_config.h | 10 | ||||
| -rw-r--r-- | sys/modules/zfs/zfs_gitrev.h | 2 |
2 files changed, 9 insertions, 3 deletions
diff --git a/sys/modules/zfs/zfs_config.h b/sys/modules/zfs/zfs_config.h index 9ef55380e57d..d9bdac34eb52 100644 --- a/sys/modules/zfs/zfs_config.h +++ b/sys/modules/zfs/zfs_config.h @@ -97,6 +97,9 @@ /* bdev_*_io_acct() available */ /* #undef HAVE_BDEV_IO_ACCT */ +/* bdev_kobj() exists */ +/* #undef HAVE_BDEV_KOBJ */ + /* bdev_max_discard_sectors() is available */ /* #undef HAVE_BDEV_MAX_DISCARD_SECTORS */ @@ -536,6 +539,9 @@ /* folio_wait_bit() exists */ /* #undef HAVE_PAGEMAP_FOLIO_WAIT_BIT */ +/* part_to_dev() exists */ +/* #undef HAVE_PART_TO_DEV */ + /* iops->getattr() takes a path */ /* #undef HAVE_PATH_IOPS_GETATTR */ @@ -949,7 +955,7 @@ /* #undef ZFS_IS_GPL_COMPATIBLE */ /* Define the project alias string. */ -#define ZFS_META_ALIAS "zfs-2.1.99-FreeBSD_gc629f0bf6" +#define ZFS_META_ALIAS "zfs-2.1.99-FreeBSD_gd62bafee9" /* Define the project author. */ #define ZFS_META_AUTHOR "OpenZFS" @@ -979,7 +985,7 @@ #define ZFS_META_NAME "zfs" /* Define the project release. */ -#define ZFS_META_RELEASE "FreeBSD_gc629f0bf6" +#define ZFS_META_RELEASE "FreeBSD_gd62bafee9" /* Define the project version. */ #define ZFS_META_VERSION "2.1.99" diff --git a/sys/modules/zfs/zfs_gitrev.h b/sys/modules/zfs/zfs_gitrev.h index e933621159d5..e0c6ae76e8cc 100644 --- a/sys/modules/zfs/zfs_gitrev.h +++ b/sys/modules/zfs/zfs_gitrev.h @@ -1 +1 @@ -#define ZFS_META_GITREV "zfs-2.1.99-1404-gc629f0bf6" +#define ZFS_META_GITREV "zfs-2.1.99-1439-gd62bafee9" |