From 4ef69de384838f9dab49fe2ed0caf453fa2aab1d Mon Sep 17 00:00:00 2001 From: Richard Yao Date: Tue, 10 Jan 2023 16:58:21 -0500 Subject: [PATCH] Cleanup: Use NULL when doing NULL pointer comparisons The Linux 5.16.14 kernel's coccicheck caught this. The semantic patch that caught it was: ./scripts/coccinelle/null/badzero.cocci Reviewed-by: Brian Behlendorf Signed-off-by: Richard Yao Closes #14372 --- module/os/freebsd/spl/callb.c | 2 +- module/zfs/arc.c | 2 +- module/zfs/blake3_zfs.c | 4 ++-- module/zfs/zap.c | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/module/os/freebsd/spl/callb.c b/module/os/freebsd/spl/callb.c index 2bfd4ea16..850f37ddf 100644 --- a/module/os/freebsd/spl/callb.c +++ b/module/os/freebsd/spl/callb.c @@ -263,7 +263,7 @@ callb_execute_class(int class, int code) mutex_enter(&ct->ct_lock); for (cp = ct->ct_first_cb[class]; - cp != NULL && ret == 0; cp = cp->c_next) { + cp != NULL && ret == NULL; cp = cp->c_next) { while (cp->c_flag & CALLB_EXECUTING) cv_wait(&cp->c_done_cv, &ct->ct_lock); /* diff --git a/module/zfs/arc.c b/module/zfs/arc.c index 3c5d5585c..2a52d0d24 100644 --- a/module/zfs/arc.c +++ b/module/zfs/arc.c @@ -4783,7 +4783,7 @@ arc_flush(spa_t *spa, boolean_t retry) * no good way to determine if all of a spa's buffers have been * evicted from an arc state. */ - ASSERT(!retry || spa == 0); + ASSERT(!retry || spa == NULL); if (spa != NULL) guid = spa_load_guid(spa); diff --git a/module/zfs/blake3_zfs.c b/module/zfs/blake3_zfs.c index 7560f30fd..bcc595bca 100644 --- a/module/zfs/blake3_zfs.c +++ b/module/zfs/blake3_zfs.c @@ -47,7 +47,7 @@ void abd_checksum_blake3_native(abd_t *abd, uint64_t size, const void *ctx_template, zio_cksum_t *zcp) { - ASSERT(ctx_template != 0); + ASSERT(ctx_template != NULL); #if defined(_KERNEL) BLAKE3_CTX *ctx = blake3_per_cpu_ctx[CPU_SEQID_UNSTABLE]; @@ -76,7 +76,7 @@ abd_checksum_blake3_byteswap(abd_t *abd, uint64_t size, { zio_cksum_t tmp; - ASSERT(ctx_template != 0); + ASSERT(ctx_template != NULL); abd_checksum_blake3_native(abd, size, ctx_template, &tmp); zcp->zc_word[0] = BSWAP_64(tmp.zc_word[0]); diff --git a/module/zfs/zap.c b/module/zfs/zap.c index 7ba5ad9ea..dde05d700 100644 --- a/module/zfs/zap.c +++ b/module/zfs/zap.c @@ -946,9 +946,9 @@ fzap_length(zap_name_t *zn, if (err != 0) goto out; - if (integer_size != 0) + if (integer_size != NULL) *integer_size = zeh.zeh_integer_size; - if (num_integers != 0) + if (num_integers != NULL) *num_integers = zeh.zeh_num_integers; out: zap_put_leaf(l);