diff options
| -rw-r--r-- | cmd/zed/agents/fmd_api.c | 2 | ||||
| -rw-r--r-- | cmd/zed/agents/zfs_mod.c | 2 | ||||
| -rw-r--r-- | cmd/zed/zed_conf.c | 4 | ||||
| -rw-r--r-- | cmd/zed/zed_disk_event.c | 2 | ||||
| -rw-r--r-- | cmd/zed/zed_exec.c | 2 | ||||
| -rw-r--r-- | module/zfs/spa_checkpoint.c | 2 |
6 files changed, 7 insertions, 7 deletions
diff --git a/cmd/zed/agents/fmd_api.c b/cmd/zed/agents/fmd_api.c index 9e46e831d..56c134b73 100644 --- a/cmd/zed/agents/fmd_api.c +++ b/cmd/zed/agents/fmd_api.c @@ -372,7 +372,7 @@ zed_log_fault(nvlist_t *nvl, const char *uuid, const char *code) if (code != NULL) zed_log_msg(LOG_INFO, "\t%s: %s", FM_SUSPECT_DIAG_CODE, code); if (nvlist_lookup_uint8(nvl, FM_FAULT_CERTAINTY, &byte) == 0) - zed_log_msg(LOG_INFO, "\t%s: %llu", FM_FAULT_CERTAINTY, byte); + zed_log_msg(LOG_INFO, "\t%s: %hhu", FM_FAULT_CERTAINTY, byte); if (nvlist_lookup_nvlist(nvl, FM_FAULT_RESOURCE, &rsrc) == 0) { if (nvlist_lookup_string(rsrc, FM_FMRI_SCHEME, &strval) == 0) zed_log_msg(LOG_INFO, "\t%s: %s", FM_FMRI_SCHEME, diff --git a/cmd/zed/agents/zfs_mod.c b/cmd/zed/agents/zfs_mod.c index 7364dd2c6..af6de73a1 100644 --- a/cmd/zed/agents/zfs_mod.c +++ b/cmd/zed/agents/zfs_mod.c @@ -364,7 +364,7 @@ zfs_process_add(zpool_handle_t *zhp, nvlist_t *vdev, boolean_t labeled) (vs->vs_state != VDEV_STATE_FAULTED) && (vs->vs_state != VDEV_STATE_CANT_OPEN)) { zed_log_msg(LOG_INFO, " not autoreplacing since disk isn't in " - "a bad state (currently %d)", vs->vs_state); + "a bad state (currently %llu)", vs->vs_state); return; } diff --git a/cmd/zed/zed_conf.c b/cmd/zed/zed_conf.c index 9a39d1a80..29de27c77 100644 --- a/cmd/zed/zed_conf.c +++ b/cmd/zed/zed_conf.c @@ -657,7 +657,7 @@ zed_conf_read_state(struct zed_conf *zcp, uint64_t *eidp, int64_t etime[]) } else if (n != len) { errno = EIO; zed_log_msg(LOG_WARNING, - "Failed to read state file \"%s\": Read %d of %d bytes", + "Failed to read state file \"%s\": Read %zd of %zd bytes", zcp->state_file, n, len); return (-1); } @@ -706,7 +706,7 @@ zed_conf_write_state(struct zed_conf *zcp, uint64_t eid, int64_t etime[]) if (n != len) { errno = EIO; zed_log_msg(LOG_WARNING, - "Failed to write state file \"%s\": Wrote %d of %d bytes", + "Failed to write state file \"%s\": Wrote %zd of %zd bytes", zcp->state_file, n, len); return (-1); } diff --git a/cmd/zed/zed_disk_event.c b/cmd/zed/zed_disk_event.c index 3c8e2fb38..db89ecc90 100644 --- a/cmd/zed/zed_disk_event.c +++ b/cmd/zed/zed_disk_event.c @@ -49,7 +49,7 @@ struct udev_monitor *g_mon; #define DEV_BYID_PATH "/dev/disk/by-id/" /* 64MB is minimum usable disk for ZFS */ -#define MINIMUM_SECTORS 131072 +#define MINIMUM_SECTORS 131072ULL /* diff --git a/cmd/zed/zed_exec.c b/cmd/zed/zed_exec.c index 369c4b695..51c292d41 100644 --- a/cmd/zed/zed_exec.c +++ b/cmd/zed/zed_exec.c @@ -263,7 +263,7 @@ _reap_children(void *arg) zed_log_msg(LOG_INFO, "Finished \"%s\" eid=%llu pid=%d " "time=%llu.%06us status=0x%X", - node.name, node.eid, + node.name, node.eid, pid, (unsigned long long) usage.ru_utime.tv_sec, (unsigned int) usage.ru_utime.tv_usec, (unsigned int) status); diff --git a/module/zfs/spa_checkpoint.c b/module/zfs/spa_checkpoint.c index b5b1dfa8a..a837b1ce9 100644 --- a/module/zfs/spa_checkpoint.c +++ b/module/zfs/spa_checkpoint.c @@ -347,7 +347,7 @@ spa_checkpoint_discard_thread_sync(void *arg, dmu_tx_t *tx) if (error != 0) { zfs_panic_recover("zfs: error %lld was returned " "while incrementally destroying the checkpoint " - "space map of vdev %u\n", + "space map of vdev %llu\n", (longlong_t)error, vd->vdev_id); } ASSERT0(words_after); |