Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Cleanup: Remove ineffective unsigned comparisons against 0 

Coverity found a number of places where we either do MAX(unsigned, 0) or
do assertions that a unsigned variable is >= 0. These do nothing, so
let us drop them all.

It also found a spot where we do `if (unsigned >= 0 && ...)`. Let us
also drop the unsigned >= 0 check.

Reviewed-by: Neal Gompa <ngompa@datto.com>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Richard Yao <richard.yao@alumni.stonybrook.edu>
Closes #13871
This commit is contained in:
Richard Yao 2022-09-26 20:02:38 -04:00 committed by GitHub
parent 52afc3443d
commit 8ef15f9322
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
module/icp/algs/blake3/blake3_impl.c
View File

@ -155,7 +155,6 @@ blake3_impl_setid(uint32_t id)
atomic_swap_32(&blake3_impl_chosen, IMPL_CYCLE); atomic_swap_32(&blake3_impl_chosen, IMPL_CYCLE);
break; break;
default: default:
ASSERT3U(id, >=, 0);
ASSERT3U(id, <, blake3_supp_impls_cnt); ASSERT3U(id, <, blake3_supp_impls_cnt);
atomic_swap_32(&blake3_impl_chosen, id); atomic_swap_32(&blake3_impl_chosen, id);
break; break;

2
module/os/freebsd/zfs/zfs_acl.c
View File

@ -527,7 +527,7 @@ zfs_acl_valid_ace_type(uint_t type, uint_t flags)
entry_type == ACE_EVERYONE || entry_type == 0 || entry_type == ACE_EVERYONE || entry_type == 0 ||
entry_type == ACE_IDENTIFIER_GROUP); entry_type == ACE_IDENTIFIER_GROUP);
default: default:
if (type >= MIN_ACE_TYPE && type <= MAX_ACE_TYPE) if (type <= MAX_ACE_TYPE)
return (B_TRUE); return (B_TRUE);
} }
return (B_FALSE); return (B_FALSE);

2
module/os/linux/zfs/zfs_acl.c
View File

@ -525,7 +525,7 @@ zfs_acl_valid_ace_type(uint_t type, uint_t flags)
entry_type == ACE_EVERYONE || entry_type == 0 || entry_type == ACE_EVERYONE || entry_type == 0 ||
entry_type == ACE_IDENTIFIER_GROUP); entry_type == ACE_IDENTIFIER_GROUP);
default: default:
if (type >= MIN_ACE_TYPE && type <= MAX_ACE_TYPE) if (type <= MAX_ACE_TYPE)
return (B_TRUE); return (B_TRUE);
} }
return (B_FALSE); return (B_FALSE);

2
module/os/linux/zfs/zvol_os.c
View File

@ -1433,7 +1433,7 @@ zvol_os_create_minor(const char *name)
* Prefetching the blocks commonly scanned by blkid(8) will speed * Prefetching the blocks commonly scanned by blkid(8) will speed
* up this process. * up this process.
*/ */
len = MIN(MAX(zvol_prefetch_bytes, 0), SPA_MAXBLOCKSIZE); len = MIN(zvol_prefetch_bytes, SPA_MAXBLOCKSIZE);
if (len > 0) { if (len > 0) {
dmu_prefetch(os, ZVOL_OBJ, 0, 0, len, ZIO_PRIORITY_SYNC_READ); dmu_prefetch(os, ZVOL_OBJ, 0, 0, len, ZIO_PRIORITY_SYNC_READ);
dmu_prefetch(os, ZVOL_OBJ, 0, volsize - len, len, dmu_prefetch(os, ZVOL_OBJ, 0, volsize - len, len,

2
module/zfs/arc.c
View File

@ -7664,7 +7664,7 @@ arc_tuning_update(boolean_t verbose)
/* Valid range: 0 - <all physical memory> */ /* Valid range: 0 - <all physical memory> */
if ((zfs_arc_sys_free) && (zfs_arc_sys_free != arc_sys_free)) if ((zfs_arc_sys_free) && (zfs_arc_sys_free != arc_sys_free))
arc_sys_free = MIN(MAX(zfs_arc_sys_free, 0), allmem); arc_sys_free = MIN(zfs_arc_sys_free, allmem);
WARN_IF_TUNING_IGNORED(zfs_arc_sys_free, arc_sys_free, verbose); WARN_IF_TUNING_IGNORED(zfs_arc_sys_free, arc_sys_free, verbose);
} }

2
module/zfs/dsl_dataset.c
View File

@ -2128,8 +2128,6 @@ dsl_livelist_should_disable(dsl_dataset_t *ds)
used = dsl_dir_get_usedds(ds->ds_dir); used = dsl_dir_get_usedds(ds->ds_dir);
referenced = dsl_get_referenced(ds); referenced = dsl_get_referenced(ds);
ASSERT3U(referenced, >=, 0);
ASSERT3U(used, >=, 0);
if (referenced == 0) if (referenced == 0)
return (B_FALSE); return (B_FALSE);
percent_shared = (100 * (referenced - used)) / referenced; percent_shared = (100 * (referenced - used)) / referenced;

1
module/zfs/refcount.c
View File

@ -137,7 +137,6 @@ zfs_refcount_add_many(zfs_refcount_t *rc, uint64_t number, const void *holder)
ref->ref_holder = holder; ref->ref_holder = holder;
ref->ref_number = number; ref->ref_number = number;
mutex_enter(&rc->rc_mtx); mutex_enter(&rc->rc_mtx);
ASSERT3U(rc->rc_count, >=, 0);
list_insert_head(&rc->rc_list, ref); list_insert_head(&rc->rc_list, ref);
rc->rc_count += number; rc->rc_count += number;
count = rc->rc_count; count = rc->rc_count;

2
module/zfs/vdev_queue.c
View File

@ -614,7 +614,7 @@ vdev_queue_aggregate(vdev_queue_t *vq, zio_t *zio)
limit = zfs_vdev_aggregation_limit_non_rotating; limit = zfs_vdev_aggregation_limit_non_rotating;
else else
limit = zfs_vdev_aggregation_limit; limit = zfs_vdev_aggregation_limit;
limit = MAX(MIN(limit, maxblocksize), 0); limit = MIN(limit, maxblocksize);
if (zio->io_flags & ZIO_FLAG_DONT_AGGREGATE || limit == 0) if (zio->io_flags & ZIO_FLAG_DONT_AGGREGATE || limit == 0)
return (NULL); return (NULL);