d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

zfs: merge openzfs/zfs@8e8acabdc

Browse Source 
Notable upstream pull request merges:
  #14987 Fix memory leak in zil_parse()

Obtained from:	OpenZFS
OpenZFS commit:	8e8acabdca
This commit is contained in:
Martin Matuska 2023-06-25 10:31:19 +02:00
commit f190c36b5d
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys/contrib/openzfs/module/zfs/zil.c
View File

@ -522,12 +522,16 @@ zil_parse(zilog_t *zilog, zil_parse_blk_func_t *parse_blk_func,
lr_t *lr = (lr_t *)lrp;
reclen = lr->lrc_reclen;
ASSERT3U(reclen, >=, sizeof (lr_t));
if (lr->lrc_seq > claim_lr_seq)
if (lr->lrc_seq > claim_lr_seq) {
arc_buf_destroy(abuf, &abuf);
goto done;
}
error = parse_lr_func(zilog, lr, arg, txg);
if (error != 0)
if (error != 0) {
arc_buf_destroy(abuf, &abuf);
goto done;
}
ASSERT3U(max_lr_seq, <, lr->lrc_seq);
max_lr_seq = lr->lrc_seq;
lr_count++;

4
sys/modules/zfs/zfs_config.h
View File

@ -1051,7 +1051,7 @@
/* #undef ZFS_IS_GPL_COMPATIBLE */
/* Define the project alias string. */
#define ZFS_META_ALIAS "zfs-2.1.99-FreeBSD_g10e36e176"
#define ZFS_META_ALIAS "zfs-2.1.99-FreeBSD_g8e8acabdc"
/* Define the project author. */
#define ZFS_META_AUTHOR "OpenZFS"
@ -1081,7 +1081,7 @@
#define ZFS_META_NAME "zfs"
/* Define the project release. */
#define ZFS_META_RELEASE "FreeBSD_g10e36e176"
#define ZFS_META_RELEASE "FreeBSD_g8e8acabdc"
/* Define the project version. */
#define ZFS_META_VERSION "2.1.99"

2
sys/modules/zfs/zfs_gitrev.h
View File

@ -1 +1 @@
#define ZFS_META_GITREV "zfs-2.1.99-1998-g10e36e176"
#define ZFS_META_GITREV "zfs-2.1.99-1999-g8e8acabdc"