diff options
| author | Martin Matuska <mm@FreeBSD.org> | 2022-01-22 22:05:15 +0000 |
|---|---|---|
| committer | Martin Matuska <mm@FreeBSD.org> | 2022-01-22 22:05:15 +0000 |
| commit | e92ffd9b626833ebdbf2742c8ffddc6cd94b963e (patch) | |
| tree | e0930ac4f07626135f89cb94535ff2f1a9fe8390 /sys/contrib/openzfs/module/icp/algs/modes/cbc.c | |
| parent | 3c3df3660072cd50b44aa72cbe23b0ec3341aa26 (diff) | |
| parent | 17b2ae0b24d487fdda2ef1098ec26fa7f79a61f6 (diff) | |
| download | src-e92ffd9b626833ebdbf2742c8ffddc6cd94b963e.tar.gz src-e92ffd9b626833ebdbf2742c8ffddc6cd94b963e.zip | |
zfs: merge openzfs/zfs@17b2ae0b2 (master) into main
Notable upstream pull request merges:
#12766 Fix error propagation from lzc_send_redacted
#12805 Updated the lz4 decompressor
#12851 FreeBSD: Provide correct file generation number
#12857 Verify dRAID empty sectors
#12874 FreeBSD: Update argument types for VOP_READDIR
#12896 Reduce number of arc_prune threads
#12934 FreeBSD: Fix zvol_*_open() locking
#12947 lz4: Cherrypick fix for CVE-2021-3520
#12961 FreeBSD: Fix leaked strings in libspl mnttab
#12964 Fix handling of errors from dmu_write_uio_dbuf() on FreeBSD
#12981 Introduce a flag to skip comparing the local mac when raw sending
#12985 Avoid memory allocations in the ARC eviction thread
Obtained from: OpenZFS
OpenZFS commit: 17b2ae0b24d487fdda2ef1098ec26fa7f79a61f6
Diffstat (limited to 'sys/contrib/openzfs/module/icp/algs/modes/cbc.c')
| -rw-r--r-- | sys/contrib/openzfs/module/icp/algs/modes/cbc.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/sys/contrib/openzfs/module/icp/algs/modes/cbc.c b/sys/contrib/openzfs/module/icp/algs/modes/cbc.c index 85864f56dead..bddb5b64ddd3 100644 --- a/sys/contrib/openzfs/module/icp/algs/modes/cbc.c +++ b/sys/contrib/openzfs/module/icp/algs/modes/cbc.c @@ -137,7 +137,6 @@ out: #define OTHER(a, ctx) \ (((a) == (ctx)->cbc_lastblock) ? (ctx)->cbc_iv : (ctx)->cbc_lastblock) -/* ARGSUSED */ int cbc_decrypt_contiguous_blocks(cbc_ctx_t *ctx, char *data, size_t length, crypto_data_t *out, size_t block_size, @@ -259,7 +258,6 @@ cbc_init_ctx(cbc_ctx_t *cbc_ctx, char *param, size_t param_len, return (CRYPTO_SUCCESS); } -/* ARGSUSED */ void * cbc_alloc_ctx(int kmflag) { |