diff options
| author | наб <[email protected]> | 2021-06-05 13:14:12 +0200 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2021-07-26 12:07:15 -0700 |
| commit | 5dbf6c5a66d3de65f1b0436c8e83097dd49ff059 (patch) | |
| tree | 59d33400d59c4935afcd37bbbf0263dd96cac71f /module/zfs | |
| parent | 13737094503a38a219f1ffe641cb257bb4b879cb (diff) | |
Replace /*PRINTFLIKEn*/ with attribute(printf)
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Ahelenia Ziemiańska <[email protected]>
Issue #12201
Diffstat (limited to 'module/zfs')
| -rw-r--r-- | module/zfs/arc.c | 2 | ||||
| -rw-r--r-- | module/zfs/spa_log_spacemap.c | 4 | ||||
| -rw-r--r-- | module/zfs/spa_misc.c | 2 | ||||
| -rw-r--r-- | module/zfs/vdev.c | 4 | ||||
| -rw-r--r-- | module/zfs/vdev_raidz_math.c | 8 |
5 files changed, 9 insertions, 11 deletions
diff --git a/module/zfs/arc.c b/module/zfs/arc.c index 02663e8e2..75b1dcc82 100644 --- a/module/zfs/arc.c +++ b/module/zfs/arc.c @@ -7470,7 +7470,7 @@ arc_state_multilist_index_func(multilist_t *ml, void *obj) if ((do_warn) && (tuning) && ((tuning) != (value))) { \ cmn_err(CE_WARN, \ "ignoring tunable %s (using %llu instead)", \ - (#tuning), (value)); \ + (#tuning), (u_longlong_t)(value)); \ } \ } while (0) diff --git a/module/zfs/spa_log_spacemap.c b/module/zfs/spa_log_spacemap.c index f4c2910ad..6fd302b8d 100644 --- a/module/zfs/spa_log_spacemap.c +++ b/module/zfs/spa_log_spacemap.c @@ -1033,8 +1033,8 @@ spa_ld_log_sm_metadata(spa_t *spa) if (sls == NULL) { spa_load_failed(spa, "spa_ld_log_sm_metadata(): bug " "encountered: could not find log spacemap for " - "TXG %ld [error %d]", - metaslab_unflushed_txg(m), ENOENT); + "TXG %llu [error %d]", + (u_longlong_t)metaslab_unflushed_txg(m), ENOENT); return (ENOENT); } sls->sls_mscount++; diff --git a/module/zfs/spa_misc.c b/module/zfs/spa_misc.c index ad1c4437c..1ecd2294d 100644 --- a/module/zfs/spa_misc.c +++ b/module/zfs/spa_misc.c @@ -389,7 +389,6 @@ uint64_t spa_max_slop = 128ULL * 1024 * 1024 * 1024; int spa_allocators = 4; -/*PRINTFLIKE2*/ void spa_load_failed(spa_t *spa, const char *fmt, ...) { @@ -404,7 +403,6 @@ spa_load_failed(spa_t *spa, const char *fmt, ...) spa->spa_trust_config ? "trusted" : "untrusted", buf); } -/*PRINTFLIKE2*/ void spa_load_note(spa_t *spa, const char *fmt, ...) { diff --git a/module/zfs/vdev.c b/module/zfs/vdev.c index 4e316d813..47a475135 100644 --- a/module/zfs/vdev.c +++ b/module/zfs/vdev.c @@ -137,7 +137,6 @@ int zfs_nocacheflush = 0; uint64_t zfs_vdev_max_auto_ashift = ASHIFT_MAX; uint64_t zfs_vdev_min_auto_ashift = ASHIFT_MIN; -/*PRINTFLIKE2*/ void vdev_dbgmsg(vdev_t *vd, const char *fmt, ...) { @@ -3457,7 +3456,8 @@ vdev_load(vdev_t *vd) vdev_set_state(vd, B_FALSE, VDEV_STATE_CANT_OPEN, VDEV_AUX_CORRUPT_DATA); vdev_dbgmsg(vd, "vdev_load: zap_lookup(top_zap=%llu) " - "failed [error=%d]", vd->vdev_top_zap, error); + "failed [error=%d]", + (u_longlong_t)vd->vdev_top_zap, error); return (error); } } diff --git a/module/zfs/vdev_raidz_math.c b/module/zfs/vdev_raidz_math.c index 25d76970e..138b7dac5 100644 --- a/module/zfs/vdev_raidz_math.c +++ b/module/zfs/vdev_raidz_math.c @@ -165,8 +165,8 @@ vdev_raidz_math_generate(raidz_map_t *rm, raidz_row_t *rr) break; default: gen_parity = NULL; - cmn_err(CE_PANIC, "invalid RAID-Z configuration %d", - raidz_parity(rm)); + cmn_err(CE_PANIC, "invalid RAID-Z configuration %llu", + (u_longlong_t)raidz_parity(rm)); break; } @@ -257,8 +257,8 @@ vdev_raidz_math_reconstruct(raidz_map_t *rm, raidz_row_t *rr, rec_fn = reconstruct_fun_pqr_sel(rm, parity_valid, nbaddata); break; default: - cmn_err(CE_PANIC, "invalid RAID-Z configuration %d", - raidz_parity(rm)); + cmn_err(CE_PANIC, "invalid RAID-Z configuration %llu", + (u_longlong_t)raidz_parity(rm)); break; } |