c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2024-12-26 11:19:32 +03:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup: Use MIN() macro

Browse Source 
The Linux 5.16.14 kernel's coccicheck caught this. The semantic
patch that caught it was:

./scripts/coccinelle/misc/minmax.cocci

There was a third opportunity to use `MIN()`, but that was in
`FSE_minTableLog()` in `module/zstd/lib/compress/fse_compress.c`.
Upstream zstd has yet to make this change and I did not want to change
header includes just for MIN, or do a one off, so I left it alone.

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Richard Yao <richard.yao@alumni.stonybrook.edu>
Closes #14372
This commit is contained in:
Richard Yao 2023-01-10 16:41:26 -05:00 committed by Brian Behlendorf
parent e6328fda2e
commit 3b2f9c1ec8
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
module/icp/algs/modes/ccm.c
View File

@ -657,7 +657,7 @@ ccm_format_initial_blocks(uchar_t *nonce, ulong_t nonceSize,
memset(&(b0[1+nonceSize]), 0, q); memset(&(b0[1+nonceSize]), 0, q);
payloadSize = aes_ctx->ccm_data_len; payloadSize = aes_ctx->ccm_data_len;
limit = 8 < q ? 8 : q; limit = MIN(8, q);
for (i = 0, j = 0, k = 15; i < limit; i++, j += 8, k--) { for (i = 0, j = 0, k = 15; i < limit; i++, j += 8, k--) {
b0[k] = (uint8_t)((payloadSize >> j) & 0xFF); b0[k] = (uint8_t)((payloadSize >> j) & 0xFF);

3
module/zfs/dmu_send.c
View File

@ -1842,8 +1842,7 @@ send_reader_thread(void *arg)
continue; continue;
} }
uint64_t file_max = uint64_t file_max =
(dn->dn_maxblkid < range->end_blkid ? MIN(dn->dn_maxblkid, range->end_blkid);
dn->dn_maxblkid : range->end_blkid);
/* /*
* The object exists, so we need to try to find the * The object exists, so we need to try to find the
* blkptr for each block in the range we're processing. * blkptr for each block in the range we're processing.