diff options
| author | Martin Matuska <mm@FreeBSD.org> | 2023-06-25 08:31:19 +0000 |
|---|---|---|
| committer | Martin Matuska <mm@FreeBSD.org> | 2023-06-25 08:32:42 +0000 |
| commit | f190c36b5d45cbfadc922a69d79628c43cdda22f (patch) | |
| tree | aebe287d6305e52cd7924115c0664b7eb02d91e4 | |
| parent | 229d643c4dd5c1a1695e5de48fab0524132f5deb (diff) | |
| parent | 8e8acabdcaeb831c777f71361722f4235b698a8d (diff) | |
zfs: merge openzfs/zfs@8e8acabdc
Notable upstream pull request merges:
#14987 Fix memory leak in zil_parse()
Obtained from: OpenZFS
OpenZFS commit: 8e8acabdcaeb831c777f71361722f4235b698a8d
| -rw-r--r-- | sys/contrib/openzfs/module/zfs/zil.c | 8 | ||||
| -rw-r--r-- | sys/modules/zfs/zfs_config.h | 4 | ||||
| -rw-r--r-- | sys/modules/zfs/zfs_gitrev.h | 2 |
3 files changed, 9 insertions, 5 deletions
diff --git a/sys/contrib/openzfs/module/zfs/zil.c b/sys/contrib/openzfs/module/zfs/zil.c index 8c1fe5f66838..ee8dcce3b361 100644 --- a/sys/contrib/openzfs/module/zfs/zil.c +++ b/sys/contrib/openzfs/module/zfs/zil.c @@ -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++; diff --git a/sys/modules/zfs/zfs_config.h b/sys/modules/zfs/zfs_config.h index caf1b68f8728..eb096b584d97 100644 --- a/sys/modules/zfs/zfs_config.h +++ b/sys/modules/zfs/zfs_config.h @@ -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" diff --git a/sys/modules/zfs/zfs_gitrev.h b/sys/modules/zfs/zfs_gitrev.h index 668f15e85337..f33a252adfac 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-1998-g10e36e176" +#define ZFS_META_GITREV "zfs-2.1.99-1999-g8e8acabdc" |