c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2024-12-25 18:59:33 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix multiplication converted to larger type

Browse Source 
This fixes the instances of the "Multiplication result converted to 
larger type" alert that codeQL scanning found.

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: Richard Yao <richard.yao@alumni.stonybrook.edu>
Signed-off-by: Andrew Innes <andrew.c12@gmail.com>
Closes #14094
This commit is contained in:
Andrew Innes 2022-10-29 00:30:37 +08:00 committed by GitHub
parent 5d0fd8429b
commit e09fdda977
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/raidz_test/raidz_test.c
View File

@ -937,7 +937,7 @@ run_sweep(void)
opts = umem_zalloc(sizeof (raidz_test_opts_t), UMEM_NOFAIL); opts = umem_zalloc(sizeof (raidz_test_opts_t), UMEM_NOFAIL);
opts->rto_ashift = ashift_v[a]; opts->rto_ashift = ashift_v[a];
opts->rto_dcols = dcols_v[d]; opts->rto_dcols = dcols_v[d];
opts->rto_offset = (1 << ashift_v[a]) * rand(); opts->rto_offset = (1ULL << ashift_v[a]) * rand();
opts->rto_dsize = size_v[s]; opts->rto_dsize = size_v[s];
opts->rto_expand = rto_opts.rto_expand; opts->rto_expand = rto_opts.rto_expand;
opts->rto_expand_offset = rto_opts.rto_expand_offset; opts->rto_expand_offset = rto_opts.rto_expand_offset;

2
lib/libefi/rdwr_efi.c
View File

@ -1362,7 +1362,7 @@ efi_write(int fd, struct dk_gpt *vtoc)
if (NBLOCKS(vtoc->efi_nparts, vtoc->efi_lbasize) < 34) { if (NBLOCKS(vtoc->efi_nparts, vtoc->efi_lbasize) < 34) {
dk_ioc.dki_length = EFI_MIN_ARRAY_SIZE + vtoc->efi_lbasize; dk_ioc.dki_length = EFI_MIN_ARRAY_SIZE + vtoc->efi_lbasize;
} else { } else {
dk_ioc.dki_length = NBLOCKS(vtoc->efi_nparts, dk_ioc.dki_length = (len_t)NBLOCKS(vtoc->efi_nparts,
vtoc->efi_lbasize) * vtoc->efi_lbasize) *
vtoc->efi_lbasize; vtoc->efi_lbasize;
} }

2
module/zfs/arc.c
View File

@ -5136,7 +5136,7 @@ arc_adapt(int bytes, arc_state_t *state)
if (!zfs_arc_p_dampener_disable) if (!zfs_arc_p_dampener_disable)
mult = MIN(mult, 10); /* avoid wild arc_p adjustment */ mult = MIN(mult, 10); /* avoid wild arc_p adjustment */
arc_p = MIN(arc_c - arc_p_min, arc_p + bytes * mult); arc_p = MIN(arc_c - arc_p_min, arc_p + (uint64_t)bytes * mult);
} else if (state == arc_mfu_ghost) { } else if (state == arc_mfu_ghost) {
uint64_t delta; uint64_t delta;

4
tests/zfs-tests/cmd/stride_dd.c
View File

@ -25,8 +25,8 @@ static int bsize = 0;
static int count = 0; static int count = 0;
static char *ifile = NULL; static char *ifile = NULL;
static char *ofile = NULL; static char *ofile = NULL;
static int stride = 0; static off_t stride = 0;
static int seek = 0; static off_t seek = 0;
static const char *execname = "stride_dd"; static const char *execname = "stride_dd";
static void usage(void); static void usage(void);